| Message ID | 20240411154223.61774-1-jamrial@gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | [FFmpeg-devel] avutil/frame: flag A53_CC side data type as allowing multiple entries | expand |
| Context | Check | Description |
|---|---|---|
| yinshiyou/make_loongarch64 | success | Make finished |
| yinshiyou/make_fate_loongarch64 | success | Make fate finished |
| andriy/make_x86 | success | Make finished |
| andriy/make_fate_x86 | success | Make fate finished |
On Thu, 11 Apr 2024, 16:42 James Almer, <jamrial@gmail.com> wrote: > Some interlaced h264 samples may export one caption per field. > > Signed-off-by: James Almer <jamrial@gmail.com> > --- > libavutil/frame.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/libavutil/frame.c b/libavutil/frame.c > index 0775e2abd9..fdac6f8ee2 100644 > --- a/libavutil/frame.c > +++ b/libavutil/frame.c > @@ -30,7 +30,6 @@ > > static const AVSideDataDescriptor sd_props[] = { > [AV_FRAME_DATA_PANSCAN] = { "AVPanScan" }, > - [AV_FRAME_DATA_A53_CC] = { "ATSC A53 Part 4 > Closed Captions" }, > [AV_FRAME_DATA_MATRIXENCODING] = { "AVMatrixEncoding" }, > [AV_FRAME_DATA_DOWNMIX_INFO] = { "Metadata relevant to > a downmix procedure" }, > [AV_FRAME_DATA_AFD] = { "Active format > description" }, > @@ -55,6 +54,7 @@ static const AVSideDataDescriptor sd_props[] = { > [AV_FRAME_DATA_AMBIENT_VIEWING_ENVIRONMENT] = { "Ambient viewing > environment", AV_SIDE_DATA_PROP_GLOBAL }, > [AV_FRAME_DATA_SPHERICAL] = { "Spherical Mapping", > AV_SIDE_DATA_PROP_GLOBAL }, > [AV_FRAME_DATA_ICC_PROFILE] = { "ICC profile", > AV_SIDE_DATA_PROP_GLOBAL }, > + [AV_FRAME_DATA_A53_CC] = { "ATSC A53 Part 4 > Closed Captions", AV_SIDE_DATA_PROP_MULTI }, > [AV_FRAME_DATA_SEI_UNREGISTERED] = { "H.26[45] User Data > Unregistered SEI message", AV_SIDE_DATA_PROP_MULTI }, > }; > > -- > 2.44.0 > But we merge the captions into a single side data element, no? Kieran >
On 4/11/2024 5:17 PM, Kieran Kunhya wrote: > On Thu, 11 Apr 2024, 16:42 James Almer, <jamrial@gmail.com> wrote: > >> Some interlaced h264 samples may export one caption per field. >> >> Signed-off-by: James Almer <jamrial@gmail.com> >> --- >> libavutil/frame.c | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/libavutil/frame.c b/libavutil/frame.c >> index 0775e2abd9..fdac6f8ee2 100644 >> --- a/libavutil/frame.c >> +++ b/libavutil/frame.c >> @@ -30,7 +30,6 @@ >> >> static const AVSideDataDescriptor sd_props[] = { >> [AV_FRAME_DATA_PANSCAN] = { "AVPanScan" }, >> - [AV_FRAME_DATA_A53_CC] = { "ATSC A53 Part 4 >> Closed Captions" }, >> [AV_FRAME_DATA_MATRIXENCODING] = { "AVMatrixEncoding" }, >> [AV_FRAME_DATA_DOWNMIX_INFO] = { "Metadata relevant to >> a downmix procedure" }, >> [AV_FRAME_DATA_AFD] = { "Active format >> description" }, >> @@ -55,6 +54,7 @@ static const AVSideDataDescriptor sd_props[] = { >> [AV_FRAME_DATA_AMBIENT_VIEWING_ENVIRONMENT] = { "Ambient viewing >> environment", AV_SIDE_DATA_PROP_GLOBAL }, >> [AV_FRAME_DATA_SPHERICAL] = { "Spherical Mapping", >> AV_SIDE_DATA_PROP_GLOBAL }, >> [AV_FRAME_DATA_ICC_PROFILE] = { "ICC profile", >> AV_SIDE_DATA_PROP_GLOBAL }, >> + [AV_FRAME_DATA_A53_CC] = { "ATSC A53 Part 4 >> Closed Captions", AV_SIDE_DATA_PROP_MULTI }, >> [AV_FRAME_DATA_SEI_UNREGISTERED] = { "H.26[45] User Data >> Unregistered SEI message", AV_SIDE_DATA_PROP_MULTI }, >> }; >> >> -- >> 2.44.0 >> > > But we merge the captions into a single side data element, no? > > Kieran Oh, I must have misread how it was exported. Dropping this patch then.
diff --git a/libavutil/frame.c b/libavutil/frame.c index 0775e2abd9..fdac6f8ee2 100644 --- a/libavutil/frame.c +++ b/libavutil/frame.c @@ -30,7 +30,6 @@ static const AVSideDataDescriptor sd_props[] = { [AV_FRAME_DATA_PANSCAN] = { "AVPanScan" }, - [AV_FRAME_DATA_A53_CC] = { "ATSC A53 Part 4 Closed Captions" }, [AV_FRAME_DATA_MATRIXENCODING] = { "AVMatrixEncoding" }, [AV_FRAME_DATA_DOWNMIX_INFO] = { "Metadata relevant to a downmix procedure" }, [AV_FRAME_DATA_AFD] = { "Active format description" }, @@ -55,6 +54,7 @@ static const AVSideDataDescriptor sd_props[] = { [AV_FRAME_DATA_AMBIENT_VIEWING_ENVIRONMENT] = { "Ambient viewing environment", AV_SIDE_DATA_PROP_GLOBAL }, [AV_FRAME_DATA_SPHERICAL] = { "Spherical Mapping", AV_SIDE_DATA_PROP_GLOBAL }, [AV_FRAME_DATA_ICC_PROFILE] = { "ICC profile", AV_SIDE_DATA_PROP_GLOBAL }, + [AV_FRAME_DATA_A53_CC] = { "ATSC A53 Part 4 Closed Captions", AV_SIDE_DATA_PROP_MULTI }, [AV_FRAME_DATA_SEI_UNREGISTERED] = { "H.26[45] User Data Unregistered SEI message", AV_SIDE_DATA_PROP_MULTI }, };
Some interlaced h264 samples may export one caption per field. Signed-off-by: James Almer <jamrial@gmail.com> --- libavutil/frame.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)