Re: [FFmpeg-devel] [PATCH] flv: fix stereo flag when writing PCMA/PCMU
Hello again, i'm bumping this patch since currently it's impossible to stream 16khz or stereo G711 tracks with RTMP, as these are always marked as 8khz, mono tracks. Please consider merging. Thanks. Il giorno dom 21 gen 2024 alle ore 16:16 Alessandro Ros ha scritto: > Currently, when writing PCMA or PCMU tracks with FLV or RTMP, the > stereo flag and sample rate flag inside RTMP audio messages are > overridden, making impossible to distinguish between mono and stereo > tracks. This patch fixes the issue by restoring the same flag mechanism > of all other codecs, that takes into consideration the right channel > count and sample rate. > > Signed-off-by: Alessandro Ros > --- > libavformat/flvenc.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/libavformat/flvenc.c b/libavformat/flvenc.c > index 874560fac1..772d891136 100644 > --- a/libavformat/flvenc.c > +++ b/libavformat/flvenc.c > @@ -208,10 +208,10 @@ error: > flags |= FLV_CODECID_NELLYMOSER| > FLV_SAMPLESSIZE_16BIT; > break; > case AV_CODEC_ID_PCM_MULAW: > -flags = FLV_CODECID_PCM_MULAW | FLV_SAMPLERATE_SPECIAL | > FLV_SAMPLESSIZE_16BIT; > +flags |= FLV_CODECID_PCM_MULAW | FLV_SAMPLESSIZE_16BIT; > break; > case AV_CODEC_ID_PCM_ALAW: > -flags = FLV_CODECID_PCM_ALAW | FLV_SAMPLERATE_SPECIAL | > FLV_SAMPLESSIZE_16BIT; > +flags |= FLV_CODECID_PCM_ALAW | FLV_SAMPLESSIZE_16BIT; > break; > case 0: > flags |= par->codec_tag << 4; > -- > 2.34.1 > > ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
Re: [FFmpeg-devel] [PATCH v2] avformat/vpcc: fix VP9 metadata in FLV and RTMP
I looked again at your previous comment and you suggested to explicitly mention that this patch will affect FLV too, which i did in the title. I didn't see any request to change the code. Do you have any suggestion regarding the code? Il giorno dom 3 set 2023 alle ore 18:17 James Almer ha scritto: > On 9/3/2023 1:15 PM, aler9 wrote: > > sorry, to git add what? > > You say you integrated my comment, but the contents of the patch are > exactly the same. > > > > > Il giorno dom 3 set 2023 alle ore 18:02 James Almer > ha > > scritto: > > > >> On 9/3/2023 1:00 PM, Alessandro Ros wrote: > >>> I integrated James A. comment and fixed patch format. > >> > >> I think you forgot to git add. > >> > >>> > >>> In order to send VP9 tracks with FLV or RTMP, the enhanced RTMP > >>> specification tells that VPCodecConfigurationRecord, a.k.a. vpcC > >>> ISO-BMFF box, must be inserted into a metadata message. However, the > >>> function responsible for generating vpcCs currently returns invalid > >>> boxes, that are lacking the Version and Flag fields, inherited from > >>> FullBox. For some reason, both flags were being added manually in > >>> movenc. This patch fixes the issue. > >>> > >>> Signed-off-by: Alessandro Ros > >>> --- > >>>libavformat/movenc.c | 3 --- > >>>libavformat/vpcc.c | 2 ++ > >>>2 files changed, 2 insertions(+), 3 deletions(-) > >>> > >>> diff --git a/libavformat/movenc.c b/libavformat/movenc.c > >>> index 7ef6cef46a..696ae5a6c9 100644 > >>> --- a/libavformat/movenc.c > >>> +++ b/libavformat/movenc.c > >>> @@ -1441,10 +1441,7 @@ static int mov_write_vpcc_tag(AVFormatContext > *s, > >> AVIOContext *pb, MOVTrack *tra > >>> > >>>avio_wb32(pb, 0); > >>>ffio_wfourcc(pb, "vpcC"); > >>> -avio_w8(pb, 1); /* version */ > >>> -avio_wb24(pb, 0); /* flags */ > >>>ff_isom_write_vpcc(s, pb, track->vos_data, track->vos_len, > >> track->par); > >>> - > >>>return update_size(pb, pos); > >>>} > >>> > >>> diff --git a/libavformat/vpcc.c b/libavformat/vpcc.c > >>> index ea66959abf..256407dd6d 100644 > >>> --- a/libavformat/vpcc.c > >>> +++ b/libavformat/vpcc.c > >>> @@ -208,6 +208,8 @@ int ff_isom_write_vpcc(AVFormatContext *s, > >> AVIOContext *pb, > >>>if (ret < 0) > >>>return ret; > >>> > >>> +avio_w8(pb, 1); /* version */ > >>> +avio_wb24(pb, 0); /* flags */ > >>>avio_w8(pb, vpcc.profile); > >>>avio_w8(pb, vpcc.level); > >>>avio_w8(pb, (vpcc.bitdepth << 4) | (vpcc.chroma_subsampling << > 1) > >> | vpcc.full_range_flag); > >> ___ > >> ffmpeg-devel mailing list > >> ffmpeg-devel@ffmpeg.org > >> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel > >> > >> To unsubscribe, visit link above, or email > >> ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe". > >> > > ___ > > ffmpeg-devel mailing list > > ffmpeg-devel@ffmpeg.org > > https://ffmpeg.org/mailman/listinfo/ffmpeg-devel > > > > To unsubscribe, visit link above, or email > > ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe". > ___ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org > https://ffmpeg.org/mailman/listinfo/ffmpeg-devel > > To unsubscribe, visit link above, or email > ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe". > ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
Re: [FFmpeg-devel] [PATCH v2] avformat/vpcc: fix VP9 metadata in FLV and RTMP
sorry, to git add what? Il giorno dom 3 set 2023 alle ore 18:02 James Almer ha scritto: > On 9/3/2023 1:00 PM, Alessandro Ros wrote: > > I integrated James A. comment and fixed patch format. > > I think you forgot to git add. > > > > > In order to send VP9 tracks with FLV or RTMP, the enhanced RTMP > > specification tells that VPCodecConfigurationRecord, a.k.a. vpcC > > ISO-BMFF box, must be inserted into a metadata message. However, the > > function responsible for generating vpcCs currently returns invalid > > boxes, that are lacking the Version and Flag fields, inherited from > > FullBox. For some reason, both flags were being added manually in > > movenc. This patch fixes the issue. > > > > Signed-off-by: Alessandro Ros > > --- > > libavformat/movenc.c | 3 --- > > libavformat/vpcc.c | 2 ++ > > 2 files changed, 2 insertions(+), 3 deletions(-) > > > > diff --git a/libavformat/movenc.c b/libavformat/movenc.c > > index 7ef6cef46a..696ae5a6c9 100644 > > --- a/libavformat/movenc.c > > +++ b/libavformat/movenc.c > > @@ -1441,10 +1441,7 @@ static int mov_write_vpcc_tag(AVFormatContext *s, > AVIOContext *pb, MOVTrack *tra > > > > avio_wb32(pb, 0); > > ffio_wfourcc(pb, "vpcC"); > > -avio_w8(pb, 1); /* version */ > > -avio_wb24(pb, 0); /* flags */ > > ff_isom_write_vpcc(s, pb, track->vos_data, track->vos_len, > track->par); > > - > > return update_size(pb, pos); > > } > > > > diff --git a/libavformat/vpcc.c b/libavformat/vpcc.c > > index ea66959abf..256407dd6d 100644 > > --- a/libavformat/vpcc.c > > +++ b/libavformat/vpcc.c > > @@ -208,6 +208,8 @@ int ff_isom_write_vpcc(AVFormatContext *s, > AVIOContext *pb, > > if (ret < 0) > > return ret; > > > > +avio_w8(pb, 1); /* version */ > > +avio_wb24(pb, 0); /* flags */ > > avio_w8(pb, vpcc.profile); > > avio_w8(pb, vpcc.level); > > avio_w8(pb, (vpcc.bitdepth << 4) | (vpcc.chroma_subsampling << 1) > | vpcc.full_range_flag); > ___ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org > https://ffmpeg.org/mailman/listinfo/ffmpeg-devel > > To unsubscribe, visit link above, or email > ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe". > ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
