[FFmpeg-devel] [PATCH] avdevice/dshow: reuse unused variables.

[FFmpeg-devel] [PATCH] avdevice/dshow: reuse unused variables.

[Diederick Niehorster]

Fix for f125c504d8fece6420bb97767f9e72414c26312a, requested_sample_rate
and such should be used.

Signed-off-by: Diederick Niehorster <dcnieho@gmail.com>
---
 libavdevice/dshow.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/libavdevice/dshow.c b/libavdevice/dshow.c
index 1e69620880..5946a72cc2 100644
--- a/libavdevice/dshow.c
+++ b/libavdevice/dshow.c
@@ -1003,9 +1003,9 @@ dshow_cycle_formats(AVFormatContext *avctx, enum dshowDeviceType devtype,
                 continue;
             }
             if (
-                (ctx->sample_rate && ctx->sample_rate != fx->nSamplesPerSec) ||
-                (ctx->sample_size && ctx->sample_size != fx->wBitsPerSample) ||
-                (ctx->channels    && ctx->channels    != fx->nChannels     )
+                (requested_sample_rate && requested_sample_rate != fx->nSamplesPerSec) ||
+                (requested_sample_size && requested_sample_size != fx->wBitsPerSample) ||
+                (requested_channels    && requested_channels    != fx->nChannels     )
             ) {
                 goto next;
             }
-- 
2.28.0.windows.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".

Re: [FFmpeg-devel] [PATCH] avdevice/dshow: reuse unused variables.

[Diederick C. Niehorster]

Ping for the below.

On Tue, Apr 19, 2022 at 10:13 AM Diederick Niehorster <dcnieho@gmail.com> wrote:
>
> Fix for f125c504d8fece6420bb97767f9e72414c26312a, requested_sample_rate
> and such should be used.
>
> Signed-off-by: Diederick Niehorster <dcnieho@gmail.com>
> ---
>  libavdevice/dshow.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/libavdevice/dshow.c b/libavdevice/dshow.c
> index 1e69620880..5946a72cc2 100644
> --- a/libavdevice/dshow.c
> +++ b/libavdevice/dshow.c
> @@ -1003,9 +1003,9 @@ dshow_cycle_formats(AVFormatContext *avctx, enum dshowDeviceType devtype,
>                  continue;
>              }
>              if (
> -                (ctx->sample_rate && ctx->sample_rate != fx->nSamplesPerSec) ||
> -                (ctx->sample_size && ctx->sample_size != fx->wBitsPerSample) ||
> -                (ctx->channels    && ctx->channels    != fx->nChannels     )
> +                (requested_sample_rate && requested_sample_rate != fx->nSamplesPerSec) ||
> +                (requested_sample_size && requested_sample_size != fx->wBitsPerSample) ||
> +                (requested_channels    && requested_channels    != fx->nChannels     )
>              ) {
>                  goto next;
>              }
> --
> 2.28.0.windows.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".

Re: [FFmpeg-devel] [PATCH] avdevice/dshow: reuse unused variables.

[James Almer]

On 4/19/2022 5:13 AM, Diederick Niehorster wrote:
> Fix for f125c504d8fece6420bb97767f9e72414c26312a, requested_sample_rate
> and such should be used.
> 
> Signed-off-by: Diederick Niehorster <dcnieho@gmail.com>
> ---
>   libavdevice/dshow.c | 6 +++---
>   1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/libavdevice/dshow.c b/libavdevice/dshow.c
> index 1e69620880..5946a72cc2 100644
> --- a/libavdevice/dshow.c
> +++ b/libavdevice/dshow.c
> @@ -1003,9 +1003,9 @@ dshow_cycle_formats(AVFormatContext *avctx, enum dshowDeviceType devtype,
>                   continue;
>               }
>               if (
> -                (ctx->sample_rate && ctx->sample_rate != fx->nSamplesPerSec) ||
> -                (ctx->sample_size && ctx->sample_size != fx->wBitsPerSample) ||
> -                (ctx->channels    && ctx->channels    != fx->nChannels     )
> +                (requested_sample_rate && requested_sample_rate != fx->nSamplesPerSec) ||
> +                (requested_sample_size && requested_sample_size != fx->wBitsPerSample) ||
> +                (requested_channels    && requested_channels    != fx->nChannels     )
>               ) {
>                   goto next;
>               }

Will apply.
_______________________________________________
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".

Re: [FFmpeg-devel] 2nd ping

[MCC CS]

Nicely applied, many thanks!
 

Sent: Sunday, April 24, 2022 at 11:04 PM
From: "James Almer"
To: ffmpeg-devel@ffmpeg.org
Subject: Re: [FFmpeg-devel] [PATCH] avdevice/dshow: reuse unused variables.
On 4/19/2022 5:13 AM, Diederick Niehorster wrote:
> Fix for f125c504d8fece6420bb97767f9e72414c26312a, requested_sample_rate
> and such should be used.
>
> Signed-off-by: Diederick Niehorster <dcnieho@gmail.com>
> ---
> libavdevice/dshow.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/libavdevice/dshow.c b/libavdevice/dshow.c
> index 1e69620880..5946a72cc2 100644
> --- a/libavdevice/dshow.c
> +++ b/libavdevice/dshow.c
> @@ -1003,9 +1003,9 @@ dshow_cycle_formats(AVFormatContext *avctx, enum dshowDeviceType devtype,
> continue;
> }
> if (
> - (ctx->sample_rate && ctx->sample_rate != fx->nSamplesPerSec) ||
> - (ctx->sample_size && ctx->sample_size != fx->wBitsPerSample) ||
> - (ctx->channels && ctx->channels != fx->nChannels )
> + (requested_sample_rate && requested_sample_rate != fx->nSamplesPerSec) ||
> + (requested_sample_size && requested_sample_size != fx->wBitsPerSample) ||
> + (requested_channels && requested_channels != fx->nChannels )
> ) {
> goto next;
> }

Will apply.
_______________________________________________
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".

Re: [FFmpeg-devel] 2nd ping

[Bang He]

look good for me

On Thu, Apr 21, 2022 at 9:55 PM MCC CS <mcccs@gmx.com> wrote:

> It would be great if anyone who reads this could review this small patch
> (original:
> https://ffmpeg.org/pipermail/ffmpeg-devel/2022-April/295351.html):
>
> This is a repost of the patch by Chris Snowhill who originally sent this
> patch
> on 31 December - which didn't receive any replies. As you can see
> on https://trac.ffmpeg.org/ticket/9564 the patch is needed and works
> perfectly.
>
> I have rebased it and recompiled it.
>
> Original commit description:
>
> Monterey needs mBytesPerFrame and mBytesPerPacket to be set, and I'm
> surprised this didn't break any previous system versions.
>
> Fixes bug #9564: Cannot decode xHE-AAC with audiotoolbox (aac_at) on
> Mac OS Monterey. Fixes likely bug that none of the AudioToolbox
> decoders work on Monterey.
> ---
> libavcodec/audiotoolboxdec.c | 5 +++++
> 1 file changed, 5 insertions(+)
>
> diff --git a/libavcodec/audiotoolboxdec.c b/libavcodec/audiotoolboxdec.c
> index b8d0e868f7..daccf4abf8 100644
> --- a/libavcodec/audiotoolboxdec.c
> +++ b/libavcodec/audiotoolboxdec.c
> @@ -375,6 +375,11 @@ static av_cold int ffat_create_decoder(AVCodecContext
> *avctx,
>      avctx->ch_layout.order       = AV_CHANNEL_ORDER_UNSPEC;
>      avctx->ch_layout.nb_channels = out_format.mChannelsPerFrame =
> in_format.mChannelsPerFrame;
>
> +    out_format.mBytesPerFrame =
> +        out_format.mChannelsPerFrame * (out_format.mBitsPerChannel / 8);
> +    out_format.mBytesPerPacket =
> +        out_format.mBytesPerFrame * out_format.mFramesPerPacket;
> +
>      if (avctx->codec_id == AV_CODEC_ID_ADPCM_IMA_QT)
>          in_format.mFramesPerPacket = 64;
>
> --
> 2.35.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".

Re: [FFmpeg-devel] 2nd ping

[James Almer]

On 4/21/2022 10:55 AM, MCC CS wrote:
> It would be great if anyone who reads this could review this small patch (original: https://ffmpeg.org/pipermail/ffmpeg-devel/2022-April/295351.html):
> 
> This is a repost of the patch by Chris Snowhill who originally sent this patch
> on 31 December - which didn't receive any replies. As you can see
> on https://trac.ffmpeg.org/ticket/9564 the patch is needed and works perfectly.
> 
> I have rebased it and recompiled it.
> 
> Original commit description:
> 
> Monterey needs mBytesPerFrame and mBytesPerPacket to be set, and I'm
> surprised this didn't break any previous system versions.
> 
> Fixes bug #9564: Cannot decode xHE-AAC with audiotoolbox (aac_at) on
> Mac OS Monterey. Fixes likely bug that none of the AudioToolbox
> decoders work on Monterey.
> ---
> libavcodec/audiotoolboxdec.c | 5 +++++
> 1 file changed, 5 insertions(+)
> 
> diff --git a/libavcodec/audiotoolboxdec.c b/libavcodec/audiotoolboxdec.c
> index b8d0e868f7..daccf4abf8 100644
> --- a/libavcodec/audiotoolboxdec.c
> +++ b/libavcodec/audiotoolboxdec.c
> @@ -375,6 +375,11 @@ static av_cold int ffat_create_decoder(AVCodecContext *avctx,
>       avctx->ch_layout.order       = AV_CHANNEL_ORDER_UNSPEC;
>       avctx->ch_layout.nb_channels = out_format.mChannelsPerFrame = in_format.mChannelsPerFrame;
> 
> +    out_format.mBytesPerFrame =
> +        out_format.mChannelsPerFrame * (out_format.mBitsPerChannel / 8);
> +    out_format.mBytesPerPacket =
> +        out_format.mBytesPerFrame * out_format.mFramesPerPacket;
> +
>       if (avctx->codec_id == AV_CODEC_ID_ADPCM_IMA_QT)
>           in_format.mFramesPerPacket = 64;
> 
> --
> 2.35.1

Will apply. Thanks.
_______________________________________________
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] 2nd ping

[MCC CS]

It would be great if anyone who reads this could review this small patch (original: https://ffmpeg.org/pipermail/ffmpeg-devel/2022-April/295351.html):

This is a repost of the patch by Chris Snowhill who originally sent this patch
on 31 December - which didn't receive any replies. As you can see
on https://trac.ffmpeg.org/ticket/9564 the patch is needed and works perfectly.

I have rebased it and recompiled it.

Original commit description:

Monterey needs mBytesPerFrame and mBytesPerPacket to be set, and I'm
surprised this didn't break any previous system versions.

Fixes bug #9564: Cannot decode xHE-AAC with audiotoolbox (aac_at) on
Mac OS Monterey. Fixes likely bug that none of the AudioToolbox
decoders work on Monterey.
---
libavcodec/audiotoolboxdec.c | 5 +++++
1 file changed, 5 insertions(+)

diff --git a/libavcodec/audiotoolboxdec.c b/libavcodec/audiotoolboxdec.c
index b8d0e868f7..daccf4abf8 100644
--- a/libavcodec/audiotoolboxdec.c
+++ b/libavcodec/audiotoolboxdec.c
@@ -375,6 +375,11 @@ static av_cold int ffat_create_decoder(AVCodecContext *avctx,
     avctx->ch_layout.order       = AV_CHANNEL_ORDER_UNSPEC;
     avctx->ch_layout.nb_channels = out_format.mChannelsPerFrame = in_format.mChannelsPerFrame;

+    out_format.mBytesPerFrame =
+        out_format.mChannelsPerFrame * (out_format.mBitsPerChannel / 8);
+    out_format.mBytesPerPacket =
+        out_format.mBytesPerFrame * out_format.mFramesPerPacket;
+
     if (avctx->codec_id == AV_CODEC_ID_ADPCM_IMA_QT)
         in_format.mFramesPerPacket = 64;

--
2.35.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".