Re: [FFmpeg-devel] [PATCH 6/6] ffprobe.c: Indicate decode-but-discard packets when doing -show_packets.

[Michael Niedermayer]

On Thu, Sep 15, 2016 at 01:36:19PM -0700, Sasi Inguva wrote:
> Signed-off-by: Sasi Inguva 
> ---
>  ffprobe.c  |   3 +-
>  tests/ref/fate/concat-demuxer-extended-lavf-mxf|   2 +-
>  .../ref/fate/concat-demuxer-extended-lavf-mxf_d10  |   2 +-
>  tests/ref/fate/concat-demuxer-simple1-lavf-mxf | 242 -
>  tests/ref/fate/concat-demuxer-simple1-lavf-mxf_d10 | 140 +-
>  tests/ref/fate/concat-demuxer-simple2-lavf-ts  | 298 
> ++---
>  tests/ref/fate/ffprobe_compact |  28 +-
>  tests/ref/fate/ffprobe_csv |  28 +-
>  tests/ref/fate/ffprobe_default |  28 +-
>  tests/ref/fate/ffprobe_flat|  28 +-
>  tests/ref/fate/ffprobe_ini |  28 +-
>  tests/ref/fate/ffprobe_json|  28 +-
>  tests/ref/fate/ffprobe_xml |  28 +-
>  13 files changed, 442 insertions(+), 441 deletions(-)
> 
> diff --git a/ffprobe.c b/ffprobe.c
> index 657867d..e64c66e 100644
> --- a/ffprobe.c
> +++ b/ffprobe.c
> @@ -1815,7 +1815,8 @@ static void show_packet(WriterContext *w, InputFile 
> *ifile, AVPacket *pkt, int p
>  print_val("size", pkt->size, unit_byte_str);
>  if (pkt->pos != -1) print_fmt("pos", "%"PRId64, pkt->pos);
>  elseprint_str_opt("pos", "N/A");
> -print_fmt("flags", "%c",  pkt->flags & AV_PKT_FLAG_KEY ? 'K' : '_');
> +print_fmt("flags", "%c%c",  pkt->flags & AV_PKT_FLAG_KEY ? 'K' : '_',
> +  pkt->flags & AV_PKT_FLAG_DISCARD ? 'D' : '_');

applied

thanks

[...]
-- 
Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

When the tyrant has disposed of foreign enemies by conquest or treaty, and
there is nothing more to fear from them, then he is always stirring up
some war or other, in order that the people may require a leader. -- Plato


signature.asc
Description: Digital signature
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel

Re: [FFmpeg-devel] [PATCH 6/6] ffprobe.c: Indicate decode-but-discard packets when doing -show_packets.

[Sasi Inguva]

ping

On Thu, Sep 15, 2016 at 1:36 PM, Sasi Inguva  wrote:

> Signed-off-by: Sasi Inguva 
> ---
>  ffprobe.c  |   3 +-
>  tests/ref/fate/concat-demuxer-extended-lavf-mxf|   2 +-
>  .../ref/fate/concat-demuxer-extended-lavf-mxf_d10  |   2 +-
>  tests/ref/fate/concat-demuxer-simple1-lavf-mxf | 242
> -
>  tests/ref/fate/concat-demuxer-simple1-lavf-mxf_d10 | 140 +-
>  tests/ref/fate/concat-demuxer-simple2-lavf-ts  | 298
> ++---
>  tests/ref/fate/ffprobe_compact |  28 +-
>  tests/ref/fate/ffprobe_csv |  28 +-
>  tests/ref/fate/ffprobe_default |  28 +-
>  tests/ref/fate/ffprobe_flat|  28 +-
>  tests/ref/fate/ffprobe_ini |  28 +-
>  tests/ref/fate/ffprobe_json|  28 +-
>  tests/ref/fate/ffprobe_xml |  28 +-
>  13 files changed, 442 insertions(+), 441 deletions(-)
>
> diff --git a/ffprobe.c b/ffprobe.c
> index 657867d..e64c66e 100644
> --- a/ffprobe.c
> +++ b/ffprobe.c
> @@ -1815,7 +1815,8 @@ static void show_packet(WriterContext *w, InputFile
> *ifile, AVPacket *pkt, int p
>  print_val("size", pkt->size, unit_byte_str);
>  if (pkt->pos != -1) print_fmt("pos", "%"PRId64, pkt->pos);
>  elseprint_str_opt("pos", "N/A");
> -print_fmt("flags", "%c",  pkt->flags & AV_PKT_FLAG_KEY ? 'K' :
> '_');
> +print_fmt("flags", "%c%c",  pkt->flags & AV_PKT_FLAG_KEY ? 'K' :
> '_',
> +  pkt->flags & AV_PKT_FLAG_DISCARD ? 'D' : '_');
>
>  if (pkt->side_data_elems) {
>  int size;
> diff --git a/tests/ref/fate/concat-demuxer-extended-lavf-mxf
> b/tests/ref/fate/concat-demuxer-extended-lavf-mxf
> index b894938..f7905aa 100644
> --- a/tests/ref/fate/concat-demuxer-extended-lavf-mxf
> +++ b/tests/ref/fate/concat-demuxer-extended-lavf-mxf
> @@ -1 +1 @@
> -0aa1ca6ff6e2e5aa926454d22fdaecd5 *tests/data/fate/concat-
> demuxer-extended-lavf-mxf.ffprobe
> +21eb3a629ff504b55c93a66879a31362 *tests/data/fate/concat-
> demuxer-extended-lavf-mxf.ffprobe
> diff --git a/tests/ref/fate/concat-demuxer-extended-lavf-mxf_d10
> b/tests/ref/fate/concat-demuxer-extended-lavf-mxf_d10
> index b378a2d..0c49f1f 100644
> --- a/tests/ref/fate/concat-demuxer-extended-lavf-mxf_d10
> +++ b/tests/ref/fate/concat-demuxer-extended-lavf-mxf_d10
> @@ -1 +1 @@
> -14c2b8d8f82f261c9627b33c481c0e8c *tests/data/fate/concat-
> demuxer-extended-lavf-mxf_d10.ffprobe
> +67a03ad49f1bd17131f751313639b61e *tests/data/fate/concat-
> demuxer-extended-lavf-mxf_d10.ffprobe
> diff --git a/tests/ref/fate/concat-demuxer-simple1-lavf-mxf
> b/tests/ref/fate/concat-demuxer-simple1-lavf-mxf
> index 3fc7957..6bba76a 100644
> --- a/tests/ref/fate/concat-demuxer-simple1-lavf-mxf
> +++ b/tests/ref/fate/concat-demuxer-simple1-lavf-mxf
> @@ -1,124 +1,124 @@
> -video|0|0|0.00|-1|-0.04|1|0.04|N/A|N/A|24801|6144|K
> -audio|1|0|0.00|0|0.00|1920|0.04|N/A|N/A|3840|31232|K
> -video|0|3|0.12|0|0.00|1|0.04|N/A|N/A|16743|35840|_
> -audio|1|1920|0.04|1920|0.04|1920|0.04|N/A|N/A|3840|52736|K
> -video|0|1|0.04|1|0.04|1|0.04|N/A|N/A|13812|57344|_
> -audio|1|3840|0.08|3840|0.08|1920|0.04|N/A|N/A|3840|71680|K
> -video|0|2|0.08|2|0.08|1|0.04|N/A|N/A|13607|76288|_
> -audio|1|5760|0.12|5760|0.12|1920|0.04|N/A|N/A|3840|90112|K
> -video|0|6|0.24|3|0.12|1|0.04|N/A|N/A|16158|94720|_
> -audio|1|7680|0.16|7680|0.16|1920|0.04|N/A|N/A|3840|04|K
> -video|0|4|0.16|4|0.16|1|0.04|N/A|N/A|13943|115712|_
> -audio|1|9600|0.20|9600|0.20|1920|0.04|N/A|N/A|3840|130048|K
> -video|0|5|0.20|5|0.20|1|0.04|N/A|N/A|11223|134656|_
> -audio|1|11520|0.24|11520|0.24|1920|0.04|N/A|N/A|3840|145920|K
> -video|0|9|0.36|6|0.24|1|0.04|N/A|N/A|20298|150528|_
> -audio|1|13440|0.28|13440|0.28|1920|0.04|N/A|N/A|3840|171008|K
> -video|0|7|0.28|7|0.28|1|0.04|N/A|N/A|13341|175616|_
> -audio|1|15360|0.32|15360|0.32|1920|0.04|N/A|N/A|3840|189440|K
> -video|0|8|0.32|8|0.32|1|0.04|N/A|N/A|12362|194048|_
> -audio|1|17280|0.36|17280|0.36|1920|0.04|N/A|N/A|3840|206848|K
> -video|0|12|0.48|9|0.36|1|0.04|N/A|N/A|24786|211456|K
> -audio|1|19200|0.40|19200|0.40|1920|0.04|N/A|N/A|3840|236544|K
> -video|0|10|0.40|10|0.40|1|0.04|N/A|N/A|13377|241152|_
> -audio|1|21120|0.44|21120|0.44|1920|0.04|N/A|N/A|3840|254976|K
> -video|0|11|0.44|11|0.44|1|0.04|N/A|N/A|15624|259584|_
> -audio|1|23040|0.48|23040|0.48|1920|0.04|N/A|N/A|3840|275456|K
> -video|0|15|0.60|12|0.48|1|0.04|N/A|N/A|22597|280064|_
> -audio|1|24960|0.52|24960|0.52|1920|0.04|N/A|N/A|3840|303104|K
> 

[FFmpeg-devel] [PATCH 6/6] ffprobe.c: Indicate decode-but-discard packets when doing -show_packets.

[Sasi Inguva]

Signed-off-by: Sasi Inguva 
---
 ffprobe.c  |   3 +-
 tests/ref/fate/concat-demuxer-extended-lavf-mxf|   2 +-
 .../ref/fate/concat-demuxer-extended-lavf-mxf_d10  |   2 +-
 tests/ref/fate/concat-demuxer-simple1-lavf-mxf | 242 -
 tests/ref/fate/concat-demuxer-simple1-lavf-mxf_d10 | 140 +-
 tests/ref/fate/concat-demuxer-simple2-lavf-ts  | 298 ++---
 tests/ref/fate/ffprobe_compact |  28 +-
 tests/ref/fate/ffprobe_csv |  28 +-
 tests/ref/fate/ffprobe_default |  28 +-
 tests/ref/fate/ffprobe_flat|  28 +-
 tests/ref/fate/ffprobe_ini |  28 +-
 tests/ref/fate/ffprobe_json|  28 +-
 tests/ref/fate/ffprobe_xml |  28 +-
 13 files changed, 442 insertions(+), 441 deletions(-)

diff --git a/ffprobe.c b/ffprobe.c
index 657867d..e64c66e 100644
--- a/ffprobe.c
+++ b/ffprobe.c
@@ -1815,7 +1815,8 @@ static void show_packet(WriterContext *w, InputFile 
*ifile, AVPacket *pkt, int p
 print_val("size", pkt->size, unit_byte_str);
 if (pkt->pos != -1) print_fmt("pos", "%"PRId64, pkt->pos);
 elseprint_str_opt("pos", "N/A");
-print_fmt("flags", "%c",  pkt->flags & AV_PKT_FLAG_KEY ? 'K' : '_');
+print_fmt("flags", "%c%c",  pkt->flags & AV_PKT_FLAG_KEY ? 'K' : '_',
+  pkt->flags & AV_PKT_FLAG_DISCARD ? 'D' : '_');
 
 if (pkt->side_data_elems) {
 int size;
diff --git a/tests/ref/fate/concat-demuxer-extended-lavf-mxf 
b/tests/ref/fate/concat-demuxer-extended-lavf-mxf
index b894938..f7905aa 100644
--- a/tests/ref/fate/concat-demuxer-extended-lavf-mxf
+++ b/tests/ref/fate/concat-demuxer-extended-lavf-mxf
@@ -1 +1 @@
-0aa1ca6ff6e2e5aa926454d22fdaecd5 
*tests/data/fate/concat-demuxer-extended-lavf-mxf.ffprobe
+21eb3a629ff504b55c93a66879a31362 
*tests/data/fate/concat-demuxer-extended-lavf-mxf.ffprobe
diff --git a/tests/ref/fate/concat-demuxer-extended-lavf-mxf_d10 
b/tests/ref/fate/concat-demuxer-extended-lavf-mxf_d10
index b378a2d..0c49f1f 100644
--- a/tests/ref/fate/concat-demuxer-extended-lavf-mxf_d10
+++ b/tests/ref/fate/concat-demuxer-extended-lavf-mxf_d10
@@ -1 +1 @@
-14c2b8d8f82f261c9627b33c481c0e8c 
*tests/data/fate/concat-demuxer-extended-lavf-mxf_d10.ffprobe
+67a03ad49f1bd17131f751313639b61e 
*tests/data/fate/concat-demuxer-extended-lavf-mxf_d10.ffprobe
diff --git a/tests/ref/fate/concat-demuxer-simple1-lavf-mxf 
b/tests/ref/fate/concat-demuxer-simple1-lavf-mxf
index 3fc7957..6bba76a 100644
--- a/tests/ref/fate/concat-demuxer-simple1-lavf-mxf
+++ b/tests/ref/fate/concat-demuxer-simple1-lavf-mxf
@@ -1,124 +1,124 @@
-video|0|0|0.00|-1|-0.04|1|0.04|N/A|N/A|24801|6144|K
-audio|1|0|0.00|0|0.00|1920|0.04|N/A|N/A|3840|31232|K
-video|0|3|0.12|0|0.00|1|0.04|N/A|N/A|16743|35840|_
-audio|1|1920|0.04|1920|0.04|1920|0.04|N/A|N/A|3840|52736|K
-video|0|1|0.04|1|0.04|1|0.04|N/A|N/A|13812|57344|_
-audio|1|3840|0.08|3840|0.08|1920|0.04|N/A|N/A|3840|71680|K
-video|0|2|0.08|2|0.08|1|0.04|N/A|N/A|13607|76288|_
-audio|1|5760|0.12|5760|0.12|1920|0.04|N/A|N/A|3840|90112|K
-video|0|6|0.24|3|0.12|1|0.04|N/A|N/A|16158|94720|_
-audio|1|7680|0.16|7680|0.16|1920|0.04|N/A|N/A|3840|04|K
-video|0|4|0.16|4|0.16|1|0.04|N/A|N/A|13943|115712|_
-audio|1|9600|0.20|9600|0.20|1920|0.04|N/A|N/A|3840|130048|K
-video|0|5|0.20|5|0.20|1|0.04|N/A|N/A|11223|134656|_
-audio|1|11520|0.24|11520|0.24|1920|0.04|N/A|N/A|3840|145920|K
-video|0|9|0.36|6|0.24|1|0.04|N/A|N/A|20298|150528|_
-audio|1|13440|0.28|13440|0.28|1920|0.04|N/A|N/A|3840|171008|K
-video|0|7|0.28|7|0.28|1|0.04|N/A|N/A|13341|175616|_
-audio|1|15360|0.32|15360|0.32|1920|0.04|N/A|N/A|3840|189440|K
-video|0|8|0.32|8|0.32|1|0.04|N/A|N/A|12362|194048|_
-audio|1|17280|0.36|17280|0.36|1920|0.04|N/A|N/A|3840|206848|K
-video|0|12|0.48|9|0.36|1|0.04|N/A|N/A|24786|211456|K
-audio|1|19200|0.40|19200|0.40|1920|0.04|N/A|N/A|3840|236544|K
-video|0|10|0.40|10|0.40|1|0.04|N/A|N/A|13377|241152|_
-audio|1|21120|0.44|21120|0.44|1920|0.04|N/A|N/A|3840|254976|K
-video|0|11|0.44|11|0.44|1|0.04|N/A|N/A|15624|259584|_
-audio|1|23040|0.48|23040|0.48|1920|0.04|N/A|N/A|3840|275456|K
-video|0|15|0.60|12|0.48|1|0.04|N/A|N/A|22597|280064|_
-audio|1|24960|0.52|24960|0.52|1920|0.04|N/A|N/A|3840|303104|K
-video|0|13|0.52|13|0.52|1|0.04|N/A|N/A|15028|307712|_
-audio|1|26880|0.56|26880|0.56|1920|0.04|N/A|N/A|3840|323072|K
-video|0|14|0.56|14|0.56|1|0.04|N/A|N/A|14014|327680|_