| Message ID | 20220804230338.13682-1-gcs584@yahoo.com |
|---|---|
| State | Accepted |
| Commit | 2c2aaa5bd055a84856225171a260641c72e68d99 |
| Headers | show |
| Series | [FFmpeg-devel] avformat/mxfdec: do not log warning of multiple ANC packets if count is 0 | 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 |
fre 2022-08-05 klockan 00:03 +0100 skrev Gavin Smith: > Some NLVEs may insert a KLV packet for EIA-608 data even though > the number of encapsulated ANC packets is zero. > --- > libavformat/mxfdec.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Looks OK. Also I'm looking at maybe adding S436m support to mxfenc, but it's going to require a bit of plumbing in ffmpeg.c I think. /Tomas
On 06/08/2022 21:44, Tomas Härdin wrote: > fre 2022-08-05 klockan 00:03 +0100 skrev Gavin Smith: >> Some NLVEs may insert a KLV packet for EIA-608 data even though >> the number of encapsulated ANC packets is zero. >> --- >> libavformat/mxfdec.c | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) > Looks OK. Also I'm looking at maybe adding S436m support to mxfenc, but > it's going to require a bit of plumbing in ffmpeg.c I think. > > /Tomas Can this be merged since there have been no objections? Gavin.
ons 2022-09-07 klockan 15:28 +0100 skrev Gavin Smith: > > On 06/08/2022 21:44, Tomas Härdin wrote: > > fre 2022-08-05 klockan 00:03 +0100 skrev Gavin Smith: > > > Some NLVEs may insert a KLV packet for EIA-608 data even though > > > the number of encapsulated ANC packets is zero. > > > --- > > > libavformat/mxfdec.c | 2 +- > > > 1 file changed, 1 insertion(+), 1 deletion(-) > > Looks OK. Also I'm looking at maybe adding S436m support to mxfenc, > > but > > it's going to require a bit of plumbing in ffmpeg.c I think. > > > > /Tomas > > Can this be merged since there have been no objections? Probably but I'm recovering from surgery, so some time next week for me unless someone else feels like pushing. I see there are other MXF patches too that I don't have the energy to deal with at the moment /Tomas
On 09/09/2022 10:45, Tomas Härdin wrote: > ons 2022-09-07 klockan 15:28 +0100 skrev Gavin Smith: >> On 06/08/2022 21:44, Tomas Härdin wrote: >>> fre 2022-08-05 klockan 00:03 +0100 skrev Gavin Smith: >>>> Some NLVEs may insert a KLV packet for EIA-608 data even though >>>> the number of encapsulated ANC packets is zero. >>>> --- >>>> libavformat/mxfdec.c | 2 +- >>>> 1 file changed, 1 insertion(+), 1 deletion(-) >>> Looks OK. Also I'm looking at maybe adding S436m support to mxfenc, >>> but >>> it's going to require a bit of plumbing in ffmpeg.c I think. >>> >>> /Tomas >> Can this be merged since there have been no objections? > Probably but I'm recovering from surgery, so some time next week for me > unless someone else feels like pushing. I see there are other MXF > patches too that I don't have the energy to deal with at the moment > > /Tomas Thanks for the update. I wish you a speedy recovery. Gavin.
On 09/09/2022 16:33, Gavin Smith wrote: > > On 09/09/2022 10:45, Tomas Härdin wrote: >> ons 2022-09-07 klockan 15:28 +0100 skrev Gavin Smith: >>> On 06/08/2022 21:44, Tomas Härdin wrote: >>>> fre 2022-08-05 klockan 00:03 +0100 skrev Gavin Smith: >>>>> Some NLVEs may insert a KLV packet for EIA-608 data even though >>>>> the number of encapsulated ANC packets is zero. >>>>> --- >>>>> libavformat/mxfdec.c | 2 +- >>>>> 1 file changed, 1 insertion(+), 1 deletion(-) >>>> Looks OK. Also I'm looking at maybe adding S436m support to mxfenc, >>>> but >>>> it's going to require a bit of plumbing in ffmpeg.c I think. >>>> >>>> /Tomas >>> Can this be merged since there have been no objections? >> Probably but I'm recovering from surgery, so some time next week for me >> unless someone else feels like pushing. I see there are other MXF >> patches too that I don't have the energy to deal with at the moment >> >> /Tomas > > > Thanks for the update. I wish you a speedy recovery. > Gavin. Any update on this? Thanks. Gavin.
ons 2022-10-05 klockan 17:12 +0100 skrev Gavin Smith: > On 09/09/2022 16:33, Gavin Smith wrote: > > > > On 09/09/2022 10:45, Tomas Härdin wrote: > > > ons 2022-09-07 klockan 15:28 +0100 skrev Gavin Smith: > > > > On 06/08/2022 21:44, Tomas Härdin wrote: > > > > > fre 2022-08-05 klockan 00:03 +0100 skrev Gavin Smith: > > > > > > Some NLVEs may insert a KLV packet for EIA-608 data even > > > > > > though > > > > > > the number of encapsulated ANC packets is zero. > > > > > > --- > > > > > > libavformat/mxfdec.c | 2 +- > > > > > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > > Looks OK. Also I'm looking at maybe adding S436m support to > > > > > mxfenc, > > > > > but > > > > > it's going to require a bit of plumbing in ffmpeg.c I think. > > > > > > > > > > /Tomas > > > > Can this be merged since there have been no objections? > > > Probably but I'm recovering from surgery, so some time next week > > > for me > > > unless someone else feels like pushing. I see there are other MXF > > > patches too that I don't have the energy to deal with at the > > > moment > > > > > > /Tomas > > > > > > Thanks for the update. I wish you a speedy recovery. > > Gavin. > > > > Any update on this? Thanks. Gavin. Pushed. Sorry for the delay /Tomas
diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c index 400941c348..f3d2cf4efa 100644 --- a/libavformat/mxfdec.c +++ b/libavformat/mxfdec.c @@ -509,7 +509,7 @@ static int mxf_get_eia608_packet(AVFormatContext *s, AVStream *st, AVPacket *pkt int did, sdid, data_length; int i, ret; - if (count != 1) + if (count > 1) av_log(s, AV_LOG_WARNING, "unsupported multiple ANC packets (%d) per KLV packet\n", count); for (i = 0; i < count; i++) {