audio chan pos rework, batchrender deadlock, titler/crikey grab_event tweak, thread...

[goodguy/history.git] / cinelerra-5.1 / cinelerra / asset.C

diff --git a/cinelerra-5.1/cinelerra/asset.C b/cinelerra-5.1/cinelerra/asset.C
index bb56d8bfc9ce38bcbb158112368ae0dcdf1efc7c..0993b12fc1c47ff65e8c36da313f18dad53acbc2 100644 (file)
--- a/cinelerra-5.1/cinelerra/asset.C
+++ b/cinelerra-5.1/cinelerra/asset.C
@@ -87,6 +87,7 @@ int Asset::init_values()
        ff_audio_options[0] = 0;
        ff_video_options[0] = 0;
        ff_audio_bitrate = 0;
+       ff_audio_quality = -1;
        ff_video_bitrate = 0;
        ff_video_quality = -1;
 
@@ -224,6 +225,7 @@ void Asset::copy_format(Asset *asset, int do_index)
        strcpy(ff_audio_options, asset->ff_audio_options);
        strcpy(ff_video_options, asset->ff_video_options);
        ff_audio_bitrate = asset->ff_audio_bitrate;
+       ff_audio_quality = asset->ff_audio_quality;
        ff_video_bitrate = asset->ff_video_bitrate;
        ff_video_quality = asset->ff_video_quality;
 
@@ -351,8 +353,8 @@ int Asset::equivalent(Asset &asset, int test_audio, int test_video, EDL *edl)
                        !strcmp(acodec, asset.acodec));
                if(result && format == FILE_FFMPEG)
                        result = !strcmp(ff_audio_options, asset.ff_audio_options) &&
-                               ff_audio_bitrate == asset.ff_audio_bitrate;
-
+                               ff_audio_bitrate == asset.ff_audio_bitrate &&
+                               ff_audio_quality == asset.ff_audio_quality;
        }
 
 
@@ -794,6 +796,7 @@ void Asset::load_defaults(BC_Hash *defaults,
 
        GET_DEFAULT("FF_AUDIO_OPTIONS", ff_audio_options);
        ff_audio_bitrate = GET_DEFAULT("FF_AUDIO_BITRATE", ff_audio_bitrate);
+       ff_audio_quality = GET_DEFAULT("FF_AUDIO_QUALITY", ff_audio_quality);
        GET_DEFAULT("FF_VIDEO_OPTIONS", ff_video_options);
        ff_video_bitrate = GET_DEFAULT("FF_VIDEO_BITRATE", ff_video_bitrate);
        ff_video_quality = GET_DEFAULT("FF_VIDEO_QUALITY", ff_video_quality);
@@ -885,6 +888,7 @@ void Asset::save_defaults(BC_Hash *defaults,
 
                UPDATE_DEFAULT("FF_AUDIO_OPTIONS", ff_audio_options);
                UPDATE_DEFAULT("FF_AUDIO_BITRATE", ff_audio_bitrate);
+               UPDATE_DEFAULT("FF_AUDIO_QUALITY", ff_audio_quality);
                UPDATE_DEFAULT("FF_VIDEO_OPTIONS", ff_video_options);
                UPDATE_DEFAULT("FF_VIDEO_BITRATE", ff_video_bitrate);
                UPDATE_DEFAULT("FF_VIDEO_QUALITY", ff_video_quality);
@@ -985,6 +989,7 @@ int Asset::dump(FILE *fp)
        fprintf(fp,"   fformat=\"%s\"\n", fformat);
        fprintf(fp,"   ff_audio_options=\"%s\"\n", ff_audio_options);
        fprintf(fp,"   ff_audio_bitrate=%d\n", ff_audio_bitrate);
+       fprintf(fp,"   ff_audio_quality=%d\n", ff_audio_quality);
        fprintf(fp,"   ff_video_options=\"%s\"\n", ff_video_options);
        fprintf(fp,"   ff_video_bitrate=%d\n", ff_video_bitrate);
        fprintf(fp,"   ff_video_quality=%d\n", ff_video_quality);