* [FFmpeg-devel] [PATCH] flv: fix stereo flag when writing PCMA/PCMU
@ 2024-01-21 15:16 Alessandro Ros
2024-01-31 9:48 ` aler9
0 siblings, 1 reply; 3+ messages in thread
From: Alessandro Ros @ 2024-01-21 15:16 UTC (permalink / raw)
To: ffmpeg-devel; +Cc: Alessandro Ros
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 <aler9.dev@gmail.com>
---
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-request@ffmpeg.org with subject "unsubscribe".
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [FFmpeg-devel] [PATCH] flv: fix stereo flag when writing PCMA/PCMU
2024-01-21 15:16 [FFmpeg-devel] [PATCH] flv: fix stereo flag when writing PCMA/PCMU Alessandro Ros
@ 2024-01-31 9:48 ` aler9
2024-02-04 19:22 ` Marton Balint
0 siblings, 1 reply; 3+ messages in thread
From: aler9 @ 2024-01-31 9:48 UTC (permalink / raw)
To: ffmpeg-devel
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 <aler9.dev@gmail.com>
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 <aler9.dev@gmail.com>
> ---
> 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-request@ffmpeg.org with subject "unsubscribe".
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [FFmpeg-devel] [PATCH] flv: fix stereo flag when writing PCMA/PCMU
2024-01-31 9:48 ` aler9
@ 2024-02-04 19:22 ` Marton Balint
0 siblings, 0 replies; 3+ messages in thread
From: Marton Balint @ 2024-02-04 19:22 UTC (permalink / raw)
To: FFmpeg development discussions and patches
On Wed, 31 Jan 2024, aler9 wrote:
> 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.
Will apply, thanks.
Marton
>
>
> Il giorno dom 21 gen 2024 alle ore 16:16 Alessandro Ros <aler9.dev@gmail.com>
> 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 <aler9.dev@gmail.com>
>> ---
>> 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-request@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-request@ffmpeg.org with subject "unsubscribe".
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-02-04 19:23 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-01-21 15:16 [FFmpeg-devel] [PATCH] flv: fix stereo flag when writing PCMA/PCMU Alessandro Ros
2024-01-31 9:48 ` aler9
2024-02-04 19:22 ` Marton Balint
Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
This inbox may be cloned and mirrored by anyone:
git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git
# If you have public-inbox 1.1+ installed, you may
# initialize and index your mirror using the following commands:
public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
ffmpegdev@gitmailbox.com
public-inbox-index ffmpegdev
Example config snippet for mirrors.
AGPL code for this site: git clone https://public-inbox.org/public-inbox.git