ff-save.c.rej

ff-save.c.rej (text/x-reject), 2.39 KB, created by Paolo Pedroni on 2023-06-07 09:16:03 UTC

--- operations/external/ff-save.c
+++ operations/external/ff-save.c
@@ -315,7 +315,8 @@ add_audio_stream (GeglProperties *o, AVFormatContext * oc, int codec_id)
   }
   cp->sample_rate = o->audio_sample_rate;
 
-  av_channel_layout_default(&cp->ch_layout, 2);
+  cp->channel_layout = AV_CH_LAYOUT_STEREO;
+  cp->channels = 2;
 
   return st;
 }
@@ -391,7 +392,8 @@ static AVFrame *alloc_audio_frame(AVCodecContext *c, int nb_samples)
 
   frame->format         = c->sample_fmt;
 
-  av_channel_layout_copy(&frame->ch_layout, &(c->ch_layout));
+  frame->channel_layout = c->channel_layout;
+  frame->channels = c->channels;
   frame->sample_rate    = c->sample_rate;
   frame->nb_samples     = nb_samples;
 
@@ -421,8 +423,8 @@ static void encode_audio_fragments (Priv *p, AVFormatContext *oc, AVStream *st,
         {
           float left = 0, right = 0;
           get_sample_data (p, i + p->audio_read_pos, &left, &right);
-          ((float*)frame->data[0])[c->ch_layout.nb_channels*i+0] = left;
-          ((float*)frame->data[0])[c->ch_layout.nb_channels*i+1] = right;
+          ((float*)frame->data[0])[c->channels*i+0] = left;
+          ((float*)frame->data[0])[c->channels*i+1] = right;
         }
         break;
       case AV_SAMPLE_FMT_FLTP:
@@ -439,8 +441,8 @@ static void encode_audio_fragments (Priv *p, AVFormatContext *oc, AVStream *st,
         {
           float left = 0, right = 0;
           get_sample_data (p, i + p->audio_read_pos, &left, &right);
-          ((int16_t*)frame->data[0])[c->ch_layout.nb_channels*i+0] = left * (1<<15);
-          ((int16_t*)frame->data[0])[c->ch_layout.nb_channels*i+1] = right * (1<<15);
+          ((int16_t*)frame->data[0])[c->channels*i+0] = left * (1<<15);
+          ((int16_t*)frame->data[0])[c->channels*i+1] = right * (1<<15);
         }
         break;
       case AV_SAMPLE_FMT_S32:
@@ -448,8 +450,8 @@ static void encode_audio_fragments (Priv *p, AVFormatContext *oc, AVStream *st,
         {
           float left = 0, right = 0;
           get_sample_data (p, i + p->audio_read_pos, &left, &right);
-          ((int32_t*)frame->data[0])[c->ch_layout.nb_channels*i+0] = left * (1<<31);
-          ((int32_t*)frame->data[0])[c->ch_layout.nb_channels*i+1] = right * (1<<31);
+          ((int32_t*)frame->data[0])[c->channels*i+0] = left * (1<<31);
+          ((int32_t*)frame->data[0])[c->channels*i+1] = right * (1<<31);
         }
         break;
       case AV_SAMPLE_FMT_S32P: