[FFmpeg-cvslog] Add the Canon XF-HEVC UL to the picture essence container UL list

2019-03-08 Thread Matthew McKenna 
ffmpeg | branch: master | Matthew McKenna  | Mon Mar  4 
23:25:05 2019 -0500| [f95aee2b72535e14b7463750fd7afb6d1cdbe4d4] | committer: 
Tomas Härdin

Add the Canon XF-HEVC UL to the picture essence container UL list

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f95aee2b72535e14b7463750fd7afb6d1cdbe4d4
---

 libavformat/mxfdec.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c
index 0553adcb06..3c3e4767e2 100644
--- a/libavformat/mxfdec.c
+++ b/libavformat/mxfdec.c
@@ -1328,6 +1328,7 @@ static const MXFCodecUL 
mxf_picture_essence_container_uls[] = {
 { { 
0x06,0x0e,0x2b,0x34,0x04,0x01,0x01,0x01,0x0d,0x01,0x03,0x01,0x02,0x05,0x00,0x00 
}, 14,   AV_CODEC_ID_RAWVIDEO, NULL, 15, RawVWrap }, /* uncompressed picture */
 { { 
0x06,0x0e,0x2b,0x34,0x04,0x01,0x01,0x0a,0x0e,0x0f,0x03,0x01,0x02,0x20,0x01,0x01 
}, 15, AV_CODEC_ID_HQ_HQA },
 { { 
0x06,0x0e,0x2b,0x34,0x04,0x01,0x01,0x0a,0x0e,0x0f,0x03,0x01,0x02,0x20,0x02,0x01 
}, 15,AV_CODEC_ID_HQX },
+{ { 
0x06,0x0e,0x2b,0x34,0x04,0x01,0x01,0x0a,0x0e,0x15,0x00,0x04,0x02,0x10,0x00,0x01 
}, 16,   AV_CODEC_ID_HEVC, NULL, 15 }, /* Canon XF-HEVC */
 { { 
0x06,0x0e,0x2b,0x34,0x01,0x01,0x01,0xff,0x4b,0x46,0x41,0x41,0x00,0x0d,0x4d,0x4f 
}, 14,   AV_CODEC_ID_RAWVIDEO }, /* Legacy ?? Uncompressed Picture */
 { { 
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 
},  0,  AV_CODEC_ID_NONE },
 };

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] lavf/deinterlace_qsv: set specific field for repeat

2019-03-08 Thread Linjie Fu 
ffmpeg | branch: master | Linjie Fu  | Fri Mar  8 23:34:01 
2019 +0800| [147ef1d9472ea39f837224bc8a2fbe07a9f04ae3] | committer: Zhong Li

lavf/deinterlace_qsv: set specific field for repeat

Set specific field for repeat in PicStruct if the frame has repeat
flag.

Match the CheckInputPicStruct in MSDK.

Fix #7701.

Signed-off-by: Linjie Fu 
Signed-off-by: Zhong Li 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=147ef1d9472ea39f837224bc8a2fbe07a9f04ae3
---

 libavfilter/vf_deinterlace_qsv.c | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/libavfilter/vf_deinterlace_qsv.c b/libavfilter/vf_deinterlace_qsv.c
index d6b02e98c5..bee10c220f 100644
--- a/libavfilter/vf_deinterlace_qsv.c
+++ b/libavfilter/vf_deinterlace_qsv.c
@@ -419,9 +419,11 @@ static int submit_frame(AVFilterContext *ctx, AVFrame 
*frame,
 qf->surface.Info.PicStruct = !qf->frame->interlaced_frame ? 
MFX_PICSTRUCT_PROGRESSIVE :
  (qf->frame->top_field_first ? 
MFX_PICSTRUCT_FIELD_TFF :

MFX_PICSTRUCT_FIELD_BFF);
-if (qf->frame->repeat_pict == 1)
+if (qf->frame->repeat_pict == 1) {
 qf->surface.Info.PicStruct |= MFX_PICSTRUCT_FIELD_REPEATED;
-else if (qf->frame->repeat_pict == 2)
+qf->surface.Info.PicStruct |= qf->frame->top_field_first ? 
MFX_PICSTRUCT_FIELD_TFF :
+
MFX_PICSTRUCT_FIELD_BFF;
+} else if (qf->frame->repeat_pict == 2)
 qf->surface.Info.PicStruct |= MFX_PICSTRUCT_FRAME_DOUBLING;
 else if (qf->frame->repeat_pict == 4)
 qf->surface.Info.PicStruct |= MFX_PICSTRUCT_FRAME_TRIPLING;

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog