diff options
author | Jörg Müller <nexyon@gmail.com> | 2015-12-27 18:33:54 +0300 |
---|---|---|
committer | Jörg Müller <nexyon@gmail.com> | 2015-12-27 18:33:54 +0300 |
commit | fcc68a02e9a315fad0e1ff0df1bb3e35f1a65fe4 (patch) | |
tree | 62e6b22b5abf7d3229147a417333f33810c78248 /source/blender/blenloader | |
parent | 0a118317fcf3ca3b650fc6428f6a6675303c49ee (diff) |
Fix T47064: Change Audio defaults to 48 kHz
Historically blender had an audio sample rate of 44.1 kHz as default which is mostly popular because it's the sample rate of audio CDs. Audaspace kept using this default from the pre 2.5 era. It was about time to change to 48 kHz, which is a more widespread standard nowadays, especially in video. It is the recommended sampling rate of the Audio Engineering Society.
Further reading: https://en.wikipedia.org/wiki/44,100_Hz#Status
Diffstat (limited to 'source/blender/blenloader')
-rw-r--r-- | source/blender/blenloader/intern/versioning_defaults.c | 5 | ||||
-rw-r--r-- | source/blender/blenloader/intern/versioning_legacy.c | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/source/blender/blenloader/intern/versioning_defaults.c b/source/blender/blenloader/intern/versioning_defaults.c index 53325a45dcf..a9c0408f291 100644 --- a/source/blender/blenloader/intern/versioning_defaults.c +++ b/source/blender/blenloader/intern/versioning_defaults.c @@ -60,6 +60,9 @@ void BLO_update_defaults_userpref_blend(void) U.versions = 1; U.savetime = 2; + + /* default from T47064 */ + U.audiorate = 48000; } /** @@ -140,6 +143,8 @@ void BLO_update_defaults_startup_blend(Main *bmain) scene->gm.lodflag |= SCE_LOD_USE_HYST; scene->gm.scehysteresis = 10; + + scene->r.ffcodecdata.audio_mixrate = 48000; } for (linestyle = bmain->linestyle.first; linestyle; linestyle = linestyle->id.next) { diff --git a/source/blender/blenloader/intern/versioning_legacy.c b/source/blender/blenloader/intern/versioning_legacy.c index ac7b7b11b61..ff390809a9b 100644 --- a/source/blender/blenloader/intern/versioning_legacy.c +++ b/source/blender/blenloader/intern/versioning_legacy.c @@ -1418,7 +1418,7 @@ void blo_do_versions_pre250(FileData *fd, Library *lib, Main *main) } for (sce = main->scene.first; sce; sce = sce->id.next) { - sce->audio.mixrate = 44100; + sce->audio.mixrate = 48000; sce->audio.flag |= AUDIO_SCRUB; sce->r.mode |= R_ENVMAP; } @@ -2219,7 +2219,7 @@ void blo_do_versions_pre250(FileData *fd, Library *lib, Main *main) } for (sce = main->scene.first; sce; sce = sce->id.next) { if (sce->audio.mixrate == 0) - sce->audio.mixrate = 44100; + sce->audio.mixrate = 48000; if (sce->r.xparts <2 ) sce->r.xparts = 4; |