Re: [FFmpeg-devel] [PATCH 4/4] ffprobe: report field order for video streams

2016-10-13 Thread Tobias Rapp

On 04.10.2016 08:15, Clément Bœsch wrote:

On Mon, Oct 03, 2016 at 11:49:39PM -0500, Rodger Combs wrote:

---
 ffprobe.c   | 13 +
 tests/ref/fate/concat-demuxer-extended-lavf-mxf |  2 +-
 tests/ref/fate/concat-demuxer-extended-lavf-mxf_d10 |  2 +-
 tests/ref/fate/concat-demuxer-simple1-lavf-mxf  |  2 +-
 tests/ref/fate/concat-demuxer-simple1-lavf-mxf_d10  |  2 +-
 tests/ref/fate/concat-demuxer-simple2-lavf-ts   |  2 +-
 tests/ref/fate/ffprobe_compact  |  4 ++--
 tests/ref/fate/ffprobe_csv  |  4 ++--
 tests/ref/fate/ffprobe_default  |  2 ++
 tests/ref/fate/ffprobe_flat |  2 ++
 tests/ref/fate/ffprobe_ini  |  2 ++
 11 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/ffprobe.c b/ffprobe.c
index bb3979c..3118e80 100644
--- a/ffprobe.c
+++ b/ffprobe.c
@@ -2268,6 +2268,19 @@ static int show_stream(WriterContext *w, AVFormatContext 
*fmt_ctx, int stream_id
 else
 print_str_opt("chroma_location", 
av_chroma_location_name(par->chroma_location));

+if (par->field_order == AV_FIELD_PROGRESSIVE)
+print_str("field_order", "progressive");
+else if (par->field_order == AV_FIELD_TT)
+print_str("field_order", "tt");
+else if (par->field_order == AV_FIELD_BB)
+print_str("field_order", "bb");
+else if (par->field_order == AV_FIELD_TB)
+print_str("field_order", "tb");
+else if (par->field_order == AV_FIELD_BT)
+print_str("field_order", "bt");
+else
+print_str_opt("field_order", "unknown");
+


This probably needs an update of doc/ffprobe.xsd


@Rodger: I guess the XSD update will look like:

diff --git a/doc/ffprobe.xsd b/doc/ffprobe.xsd
index 757de12..ac0347f 100644
--- a/doc/ffprobe.xsd
+++ b/doc/ffprobe.xsd
@@ -201,6 +201,7 @@
   
   
   
+  
   
   

I'd love to see the patch included in FFmpeg 3.2.

Regards,
Tobias

___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel


Re: [FFmpeg-devel] [PATCH 4/4] ffprobe: report field order for video streams

2016-10-04 Thread Clément Bœsch
On Mon, Oct 03, 2016 at 11:49:39PM -0500, Rodger Combs wrote:
> ---
>  ffprobe.c   | 13 +
>  tests/ref/fate/concat-demuxer-extended-lavf-mxf |  2 +-
>  tests/ref/fate/concat-demuxer-extended-lavf-mxf_d10 |  2 +-
>  tests/ref/fate/concat-demuxer-simple1-lavf-mxf  |  2 +-
>  tests/ref/fate/concat-demuxer-simple1-lavf-mxf_d10  |  2 +-
>  tests/ref/fate/concat-demuxer-simple2-lavf-ts   |  2 +-
>  tests/ref/fate/ffprobe_compact  |  4 ++--
>  tests/ref/fate/ffprobe_csv  |  4 ++--
>  tests/ref/fate/ffprobe_default  |  2 ++
>  tests/ref/fate/ffprobe_flat |  2 ++
>  tests/ref/fate/ffprobe_ini  |  2 ++
>  11 files changed, 28 insertions(+), 9 deletions(-)
> 
> diff --git a/ffprobe.c b/ffprobe.c
> index bb3979c..3118e80 100644
> --- a/ffprobe.c
> +++ b/ffprobe.c
> @@ -2268,6 +2268,19 @@ static int show_stream(WriterContext *w, 
> AVFormatContext *fmt_ctx, int stream_id
>  else
>  print_str_opt("chroma_location", 
> av_chroma_location_name(par->chroma_location));
>  
> +if (par->field_order == AV_FIELD_PROGRESSIVE)
> +print_str("field_order", "progressive");
> +else if (par->field_order == AV_FIELD_TT)
> +print_str("field_order", "tt");
> +else if (par->field_order == AV_FIELD_BB)
> +print_str("field_order", "bb");
> +else if (par->field_order == AV_FIELD_TB)
> +print_str("field_order", "tb");
> +else if (par->field_order == AV_FIELD_BT)
> +print_str("field_order", "bt");
> +else
> +print_str_opt("field_order", "unknown");
> +

This probably needs an update of doc/ffprobe.xsd

[...]

-- 
Clément B.
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel