bluray lpcm fixes from Andrew

diff --git a/cinelerra-5.1/cinelerra/bdcreate.C b/cinelerra-5.1/cinelerra/bdcreate.C
index dd1dd19a619103d666fe0ff2e6575983b8d9a87c..16c655a592c42595b2255816c72207742002a603 100644 (file)
--- a/cinelerra-5.1/cinelerra/bdcreate.C
+++ b/cinelerra-5.1/cinelerra/bdcreate.C
@@ -347,12 +347,14 @@ int CreateBD_Thread::create_bd_jobs(ArrayList<BatchRenderJob*> *jobs, const char
        }
 
 
-       fprintf(fp,"MUXOPT --blu-ray --hdmv-descriptors\n");
+       fprintf(fp,"MUXOPT --blu-ray --hdmv-descriptors --auto-chapters=5\n");
        fprintf(fp,"V_MPEG4/ISO/AVC, bd.m2ts, track=4113\n");
        if(!strcmp(use_profile, "bluray.m2ts"))
        fprintf(fp,"A_AC3, bd.m2ts, track=4352\n");
        if(!strcmp(use_profile, "bluray_lpcm.m2ts"))
        fprintf(fp,"A_LPCM, bd.m2ts, track=4352\n");
+       if(!strcmp(use_profile, "bluray_truehd.m2ts"))
+       fprintf(fp,"A_MLP, bd.m2ts, track=4352\n");
        fprintf(fp,"\n");
        fclose(fp);
 

diff --git a/cinelerra-5.1/thirdparty/src/ffmpeg-4.4.patch_99 b/cinelerra-5.1/thirdparty/src/ffmpeg-4.4.patch_99
index 6a66ff2072af2a66373b0024456e2a5e2cf27dc7..e53d07d9aec5d2ff633e8e9854998c7b9178e259 100644 (file)
--- a/cinelerra-5.1/thirdparty/src/ffmpeg-4.4.patch_99
+++ b/cinelerra-5.1/thirdparty/src/ffmpeg-4.4.patch_99
@@ -45,12 +45,12 @@
 +    switch(avctx->sample_fmt) {
 +    case AV_SAMPLE_FMT_S16:
 +       avctx->bits_per_coded_sample = 16;
-+       frame_size = 120;
++       frame_size = 240;
 +       quant =1;
 +       break;
 +    case AV_SAMPLE_FMT_S32:
 +       avctx->bits_per_coded_sample = 24;
-+       frame_size = 180;
++       frame_size = 360;
 +       quant =3;
 +       break;
 +    default:
@@ -62,13 +62,13 @@
          freq = 1;
          break;
      case 96000:
-+        frame_size *= 2;
++        //frame_size *= 2;
          freq = 4;
          break;
      case 192000:
 -      freq = 5;
 -      break;
-+      frame_size *= 4;
++      //frame_size *= 4;
 +        freq = 5;
 +        break;
 +    default:
@@ -79,7 +79,7 @@
 -    case AV_SAMPLE_FMT_S16:
 -        avctx->bits_per_coded_sample = 16;
 -        quant = 1;
-+    frame_size *= avctx->channels;
++    //frame_size *= avctx->channels;
 +    
 +    switch (avctx->channel_layout) {
 +    case AV_CH_LAYOUT_MONO: