ffprobe: reindent after previous commit

[ffmpeg] / ffprobe.c

diff --git a/ffprobe.c b/ffprobe.c
index 1d05464cbc615d82526b1901bc040215f36fe172..954a829c4bad6a49488ab32a2db30b1a6c287e7c 100644 (file)
--- a/ffprobe.c
+++ b/ffprobe.c
@@ -423,11 +423,7 @@ static inline char *upcase_string(char *dst, size_t dst_size, const char *src)
 {
     int i;
     for (i = 0; src[i] && i < dst_size-1; i++)
-        if (src[i] >= 'a' && src[i] <= 'z') {
-            dst[i] = src[i]-32;
-        } else {
-            dst[i] = src[i];
-        }
+        dst[i] = av_toupper(src[i]);
     dst[i] = 0;
     return dst;
 }
@@ -1294,26 +1290,10 @@ static void show_frame(WriterContext *w, AVFrame *frame, AVStream *stream)
     const char *s;
 
     print_section_header("frame");
-    print_str("media_type",             "video");
-    print_int("width",                  frame->width);
-    print_int("height",                 frame->height);
-    s = av_get_pix_fmt_name(frame->format);
-    if (s) print_str    ("pix_fmt", s);
-    else   print_str_opt("pix_fmt", "unknown");
-    if (frame->sample_aspect_ratio.num) {
-        print_fmt("sample_aspect_ratio", "%d:%d",
-                  frame->sample_aspect_ratio.num,
-                  frame->sample_aspect_ratio.den);
-    } else {
-        print_str_opt("sample_aspect_ratio", "N/A");
-    }
-    print_fmt("pict_type",              "%c", av_get_picture_type_char(frame->pict_type));
-    print_int("coded_picture_number",   frame->coded_picture_number);
-    print_int("display_picture_number", frame->display_picture_number);
-    print_int("interlaced_frame",       frame->interlaced_frame);
-    print_int("top_field_first",        frame->top_field_first);
-    print_int("repeat_pict",            frame->repeat_pict);
-    print_int("reference",              frame->reference);
+
+    s = av_get_media_type_string(stream->codec->codec_type);
+    if (s) print_str    ("media_type", s);
+    else   print_str_opt("media_type", "unknown");
     print_int("key_frame",              frame->key_frame);
     print_ts  ("pkt_pts",               frame->pkt_pts);
     print_time("pkt_pts_time",          frame->pkt_pts, &stream->time_base);
@@ -1321,40 +1301,89 @@ static void show_frame(WriterContext *w, AVFrame *frame, AVStream *stream)
     print_time("pkt_dts_time",          frame->pkt_dts, &stream->time_base);
     if (frame->pkt_pos != -1) print_fmt    ("pkt_pos", "%"PRId64, frame->pkt_pos);
     else                      print_str_opt("pkt_pos", "N/A");
+
+    switch (stream->codec->codec_type) {
+    case AVMEDIA_TYPE_VIDEO:
+        print_int("width",                  frame->width);
+        print_int("height",                 frame->height);
+        s = av_get_pix_fmt_name(frame->format);
+        if (s) print_str    ("pix_fmt", s);
+        else   print_str_opt("pix_fmt", "unknown");
+        if (frame->sample_aspect_ratio.num) {
+            print_fmt("sample_aspect_ratio", "%d:%d",
+                      frame->sample_aspect_ratio.num,
+                      frame->sample_aspect_ratio.den);
+        } else {
+            print_str_opt("sample_aspect_ratio", "N/A");
+        }
+        print_fmt("pict_type",              "%c", av_get_picture_type_char(frame->pict_type));
+        print_int("coded_picture_number",   frame->coded_picture_number);
+        print_int("display_picture_number", frame->display_picture_number);
+        print_int("interlaced_frame",       frame->interlaced_frame);
+        print_int("top_field_first",        frame->top_field_first);
+        print_int("repeat_pict",            frame->repeat_pict);
+        print_int("reference",              frame->reference);
+        break;
+
+    case AVMEDIA_TYPE_AUDIO:
+        s = av_get_sample_fmt_name(frame->format);
+        if (s) print_str    ("sample_fmt", s);
+        else   print_str_opt("sample_fmt", "unknown");
+        print_int("nb_samples",         frame->nb_samples);
+        break;
+    }
+
     print_section_footer("frame");
 
     av_free(pbuf.s);
     fflush(stdout);
 }
 
-static av_always_inline int get_video_frame(AVFormatContext *fmt_ctx,
-                                            AVFrame *frame, AVPacket *pkt)
+static av_always_inline int get_decoded_frame(AVFormatContext *fmt_ctx,
+                                              AVFrame *frame, int *got_frame,
+                                              AVPacket *pkt)
 {
     AVCodecContext *dec_ctx = fmt_ctx->streams[pkt->stream_index]->codec;
-    int got_picture = 0;
+    int ret = 0;
+
+    *got_frame = 0;
+    switch (dec_ctx->codec_type) {
+    case AVMEDIA_TYPE_VIDEO:
+        ret = avcodec_decode_video2(dec_ctx, frame, got_frame, pkt);
+        break;
+
+    case AVMEDIA_TYPE_AUDIO:
+        ret = avcodec_decode_audio4(dec_ctx, frame, got_frame, pkt);
+        break;
+    }
 
-    if (dec_ctx->codec_id   != CODEC_ID_NONE &&
-        dec_ctx->codec_type == AVMEDIA_TYPE_VIDEO)
-        avcodec_decode_video2(dec_ctx, frame, &got_picture, pkt);
-    return got_picture;
+    return ret;
 }
 
 static void show_packets(WriterContext *w, AVFormatContext *fmt_ctx)
 {
-    AVPacket pkt;
+    AVPacket pkt, pkt1;
     AVFrame frame;
-    int i = 0;
+    int i = 0, ret, got_frame;
 
     av_init_packet(&pkt);
 
     while (!av_read_frame(fmt_ctx, &pkt)) {
         if (do_show_packets)
             show_packet(w, fmt_ctx, &pkt, i++);
-        if (do_show_frames &&
-            get_video_frame(fmt_ctx, &frame, &pkt)) {
-            show_frame(w, &frame, fmt_ctx->streams[pkt.stream_index]);
-            av_destruct_packet(&pkt);
+        if (do_show_frames) {
+            pkt1 = pkt;
+            while (1) {
+                avcodec_get_frame_defaults(&frame);
+                ret = get_decoded_frame(fmt_ctx, &frame, &got_frame, &pkt1);
+                if (ret < 0 || !got_frame)
+                    break;
+                show_frame(w, &frame, fmt_ctx->streams[pkt.stream_index]);
+                pkt1.data += ret;
+                pkt1.size -= ret;
+            }
         }
+        av_free_packet(&pkt);
     }
     av_init_packet(&pkt);
     pkt.data = NULL;
@@ -1362,7 +1391,7 @@ static void show_packets(WriterContext *w, AVFormatContext *fmt_ctx)
     //Flush remaining frames that are cached in the decoder
     for (i = 0; i < fmt_ctx->nb_streams; i++) {
         pkt.stream_index = i;
-        while (get_video_frame(fmt_ctx, &frame, &pkt))
+        while (get_decoded_frame(fmt_ctx, &frame, &got_frame, &pkt) >= 0 && got_frame)
             show_frame(w, &frame, fmt_ctx->streams[pkt.stream_index]);
     }
 }
@@ -1743,6 +1772,7 @@ int main(int argc, char **argv)
     char *w_name = NULL, *w_args = NULL;
     int ret;
 
+    av_log_set_flags(AV_LOG_SKIP_REPEATED);
     parse_loglevel(argc, argv, options);
     av_register_all();
     avformat_network_init();