Merge commit 'c74f81786d434dfaf9b3dff06aa96bfd23d0127b'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 29 Nov 2012 13:07:51 +0000 (14:07 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 29 Nov 2012 13:07:51 +0000 (14:07 +0100)
* commit 'c74f81786d434dfaf9b3dff06aa96bfd23d0127b':
  nuv: cosmetics: pretty-printing

Conflicts:
libavformat/nuv.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavformat/nuv.c

@@@ -65,76 -66,78 +66,78 @@@ static int nuv_probe(AVProbeData *p
   * @return 1 if all required codec data was found
   */
  static int get_codec_data(AVIOContext *pb, AVStream *vst,
-                           AVStream *ast, int myth) {
+                           AVStream *ast, int myth)
+ {
      nuv_frametype frametype;
      if (!vst && !myth)
          return 1; // no codec data needed
 -    while (!pb->eof_reached) {
 +    while (!url_feof(pb)) {
          int size, subtype;
          frametype = avio_r8(pb);
          switch (frametype) {
-             case NUV_EXTRADATA:
-                 subtype = avio_r8(pb);
-                 avio_skip(pb, 6);
-                 size = PKTSIZE(avio_rl32(pb));
-                 if (vst && subtype == 'R') {
-                     vst->codec->extradata_size = size;
-                     vst->codec->extradata = av_malloc(size);
-                     avio_read(pb, vst->codec->extradata, size);
-                     size = 0;
-                     if (!myth)
-                         return 1;
-                 }
-                 break;
-             case NUV_MYTHEXT:
-                 avio_skip(pb, 7);
-                 size = PKTSIZE(avio_rl32(pb));
-                 if (size != 128 * 4)
-                     break;
-                 avio_rl32(pb); // version
-                 if (vst) {
-                     vst->codec->codec_tag = avio_rl32(pb);
-                     vst->codec->codec_id =
-                         ff_codec_get_id(ff_codec_bmp_tags, vst->codec->codec_tag);
-                     if (vst->codec->codec_tag == MKTAG('R', 'J', 'P', 'G'))
-                         vst->codec->codec_id = AV_CODEC_ID_NUV;
-                 } else
-                     avio_skip(pb, 4);
-                 if (ast) {
-                     int id;
-                     ast->codec->codec_tag = avio_rl32(pb);
-                     ast->codec->sample_rate = avio_rl32(pb);
-                     ast->codec->bits_per_coded_sample = avio_rl32(pb);
-                     ast->codec->channels = avio_rl32(pb);
-                     ast->codec->channel_layout = 0;
-                     id = ff_wav_codec_get_id(ast->codec->codec_tag,
-                                              ast->codec->bits_per_coded_sample);
-                     if (id == AV_CODEC_ID_NONE) {
-                         id = ff_codec_get_id(nuv_audio_tags,
-                                              ast->codec->codec_tag);
-                         if (id == AV_CODEC_ID_PCM_S16LE)
-                             id = ff_get_pcm_codec_id(ast->codec->bits_per_coded_sample,
-                                                      0, 0, ~1);
-                     }
-                     ast->codec->codec_id = id;
-                     ast->need_parsing = AVSTREAM_PARSE_FULL;
-                 } else
-                     avio_skip(pb, 4 * 4);
-                 size -= 6 * 4;
-                 avio_skip(pb, size);
-                 return 1;
-             case NUV_SEEKP:
-                 size = 11;
-                 break;
-             default:
-                 avio_skip(pb, 7);
-                 size = PKTSIZE(avio_rl32(pb));
+         case NUV_EXTRADATA:
+             subtype = avio_r8(pb);
+             avio_skip(pb, 6);
+             size = PKTSIZE(avio_rl32(pb));
+             if (vst && subtype == 'R') {
+                 vst->codec->extradata_size = size;
+                 vst->codec->extradata      = av_malloc(size);
+                 avio_read(pb, vst->codec->extradata, size);
+                 size = 0;
+                 if (!myth)
+                     return 1;
+             }
+             break;
+         case NUV_MYTHEXT:
+             avio_skip(pb, 7);
+             size = PKTSIZE(avio_rl32(pb));
+             if (size != 128 * 4)
                  break;
+             avio_rl32(pb); // version
+             if (vst) {
+                 vst->codec->codec_tag = avio_rl32(pb);
+                 vst->codec->codec_id =
+                     ff_codec_get_id(ff_codec_bmp_tags, vst->codec->codec_tag);
+                 if (vst->codec->codec_tag == MKTAG('R', 'J', 'P', 'G'))
+                     vst->codec->codec_id = AV_CODEC_ID_NUV;
+             } else
+                 avio_skip(pb, 4);
+             if (ast) {
+                 int id;
+                 ast->codec->codec_tag             = avio_rl32(pb);
+                 ast->codec->sample_rate           = avio_rl32(pb);
+                 ast->codec->bits_per_coded_sample = avio_rl32(pb);
+                 ast->codec->channels              = avio_rl32(pb);
+                 ast->codec->channel_layout        = 0;
+                 id = ff_wav_codec_get_id(ast->codec->codec_tag,
+                                          ast->codec->bits_per_coded_sample);
+                 if (id == AV_CODEC_ID_NONE) {
+                     id = ff_codec_get_id(nuv_audio_tags, ast->codec->codec_tag);
+                     if (id == AV_CODEC_ID_PCM_S16LE)
+                         id = ff_get_pcm_codec_id(ast->codec->bits_per_coded_sample,
+                                                  0, 0, ~1);
+                 }
+                 ast->codec->codec_id = id;
+                 ast->need_parsing = AVSTREAM_PARSE_FULL;
+             } else
+                 avio_skip(pb, 4 * 4);
+             size -= 6 * 4;
+             avio_skip(pb, size);
+             return 1;
+         case NUV_SEEKP:
+             size = 11;
+             break;
+         default:
+             avio_skip(pb, 7);
+             size = PKTSIZE(avio_rl32(pb));
+             break;
          }
          avio_skip(pb, size);
      }
@@@ -220,64 -229,71 +229,70 @@@ static int nuv_packet(AVFormatContext *
      uint8_t hdr[HDRSIZE];
      nuv_frametype frametype;
      int ret, size;
 -    while (!pb->eof_reached) {
 +    while (!url_feof(pb)) {
          int copyhdrsize = ctx->rtjpg_video ? HDRSIZE : 0;
-         uint64_t pos = avio_tell(pb);
+         uint64_t pos    = avio_tell(pb);
          ret = avio_read(pb, hdr, HDRSIZE);
          if (ret < HDRSIZE)
              return ret < 0 ? ret : AVERROR(EIO);
          frametype = hdr[0];
-         size = PKTSIZE(AV_RL32(&hdr[8]));
+         size      = PKTSIZE(AV_RL32(&hdr[8]));
          switch (frametype) {
-             case NUV_EXTRADATA:
-                 if (!ctx->rtjpg_video) {
-                     avio_skip(pb, size);
-                     break;
-                 }
-             case NUV_VIDEO:
-                 if (ctx->v_id < 0) {
-                     av_log(s, AV_LOG_ERROR, "Video packet in file without video stream!\n");
-                     avio_skip(pb, size);
-                     break;
-                 }
-                 ret = av_new_packet(pkt, copyhdrsize + size);
-                 if (ret < 0)
-                     return ret;
-                 pkt->pos = pos;
-                 pkt->flags |= hdr[2] == 0 ? AV_PKT_FLAG_KEY : 0;
-                 pkt->pts = AV_RL32(&hdr[4]);
-                 pkt->stream_index = ctx->v_id;
-                 memcpy(pkt->data, hdr, copyhdrsize);
-                 ret = avio_read(pb, pkt->data + copyhdrsize, size);
-                 if (ret < 0) {
-                     av_free_packet(pkt);
-                     return ret;
-                 }
-                 if (ret < size)
-                     av_shrink_packet(pkt, copyhdrsize + ret);
-                 return 0;
-             case NUV_AUDIO:
-                 if (ctx->a_id < 0) {
-                     av_log(s, AV_LOG_ERROR, "Audio packet in file without audio stream!\n");
-                     avio_skip(pb, size);
-                     break;
-                 }
-                 ret = av_get_packet(pb, pkt, size);
-                 pkt->flags |= AV_PKT_FLAG_KEY;
-                 pkt->pos = pos;
-                 pkt->pts = AV_RL32(&hdr[4]);
-                 pkt->stream_index = ctx->a_id;
-                 if (ret < 0) return ret;
-                 return 0;
-             case NUV_SEEKP:
-                 // contains no data, size value is invalid
+         case NUV_EXTRADATA:
+             if (!ctx->rtjpg_video) {
+                 avio_skip(pb, size);
                  break;
-             default:
+             }
+         case NUV_VIDEO:
+             if (ctx->v_id < 0) {
+                 av_log(s, AV_LOG_ERROR, "Video packet in file without video stream!\n");
                  avio_skip(pb, size);
                  break;
 -            // HACK: we have no idea if it is a keyframe,
 -            // but if we mark none seeking will not work at all.
 -            pkt->flags       |= AV_PKT_FLAG_KEY;
+             }
+             ret = av_new_packet(pkt, copyhdrsize + size);
+             if (ret < 0)
+                 return ret;
++
+             pkt->pos          = pos;
++            pkt->flags       |= hdr[2] == 0 ? AV_PKT_FLAG_KEY : 0;
+             pkt->pts          = AV_RL32(&hdr[4]);
+             pkt->stream_index = ctx->v_id;
+             memcpy(pkt->data, hdr, copyhdrsize);
+             ret = avio_read(pb, pkt->data + copyhdrsize, size);
+             if (ret < 0) {
+                 av_free_packet(pkt);
+                 return ret;
+             }
+             if (ret < size)
+                 av_shrink_packet(pkt, copyhdrsize + ret);
+             return 0;
+         case NUV_AUDIO:
+             if (ctx->a_id < 0) {
+                 av_log(s, AV_LOG_ERROR, "Audio packet in file without audio stream!\n");
+                 avio_skip(pb, size);
+                 break;
+             }
+             ret               = av_get_packet(pb, pkt, size);
+             pkt->flags       |= AV_PKT_FLAG_KEY;
+             pkt->pos          = pos;
+             pkt->pts          = AV_RL32(&hdr[4]);
+             pkt->stream_index = ctx->a_id;
+             if (ret < 0)
+                 return ret;
+             return 0;
+         case NUV_SEEKP:
+             // contains no data, size value is invalid
+             break;
+         default:
+             avio_skip(pb, size);
+             break;
          }
      }
      return AVERROR(EIO);
  }