bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

"Render Audio" cleanup:

Browse Source 
* Removed audio-only options from ffmpeg render settings (added some versionning code too)!
* Moved the Mixdon button from the Scene->Audio pannel to the Render->Render panel.
This commit is contained in:
Bastien Montagne 2013-11-07 13:32:32 +00:00
parent 56e283408a
commit a0286f42f9
8 changed files with 46 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
release/scripts/startup/bl_ui/properties_render.py
View File

@ -67,9 +67,11 @@ class RENDER_PT_render(RenderButtonsPanel, Panel):
row = layout.row(align=True)
row.operator("render.render", text="Render", icon='RENDER_STILL')
row.operator("render.render", text="Animation", icon='RENDER_ANIMATION').animation = True
row.operator("render.play_rendered_anim", text="Play", icon='PLAY')
row.operator("sound.mixdown", text="Audio", icon='PLAY_AUDIO')
layout.prop(rd, "display_mode", text="Display")
split = layout.split(1 / 3)
split.operator("render.play_rendered_anim", text="Play", icon='PLAY')
split.prop(rd, "display_mode", text="Display")
class RENDER_PT_dimensions(RenderButtonsPanel, Panel):

2
release/scripts/startup/bl_ui/properties_scene.py
View File

@ -227,8 +227,6 @@ class SCENE_PT_audio(SceneButtonsPanel, Panel):
col.prop(ffmpeg, "audio_channels", text="")
col.prop(ffmpeg, "audio_mixrate", text="Rate")
layout.operator("sound.mixdown")
class SCENE_PT_physics(SceneButtonsPanel, Panel):
bl_label = "Gravity"

47
source/blender/blenkernel/BKE_writeffmpeg.h
View File

@ -38,31 +38,34 @@
extern "C" {
#endif
#define FFMPEG_MPEG1 0
#define FFMPEG_MPEG2 1
#define FFMPEG_MPEG4 2
#define FFMPEG_AVI 3
#define FFMPEG_MOV 4
#define FFMPEG_DV 5
#define FFMPEG_H264 6
#define FFMPEG_XVID 7
#define FFMPEG_FLV 8
#define FFMPEG_MKV 9
#define FFMPEG_OGG 10
#define FFMPEG_WAV 11
#define FFMPEG_MP3 12
enum {
FFMPEG_MPEG1 = 0,
FFMPEG_MPEG2 = 1,
FFMPEG_MPEG4 = 2,
FFMPEG_AVI = 3,
FFMPEG_MOV = 4,
FFMPEG_DV = 5,
FFMPEG_H264 = 6,
FFMPEG_XVID = 7,
FFMPEG_FLV = 8,
FFMPEG_MKV = 9,
FFMPEG_OGG = 10,
FFMPEG_INVALID = 11,
};
#define FFMPEG_PRESET_NONE 0
#define FFMPEG_PRESET_DVD 1
#define FFMPEG_PRESET_SVCD 2
#define FFMPEG_PRESET_VCD 3
#define FFMPEG_PRESET_DV 4
#define FFMPEG_PRESET_H264 5
#define FFMPEG_PRESET_THEORA 6
#define FFMPEG_PRESET_XVID 7
enum {
FFMPEG_PRESET_NONE = 0,
FFMPEG_PRESET_DVD = 1,
FFMPEG_PRESET_SVCD = 2,
FFMPEG_PRESET_VCD = 3,
FFMPEG_PRESET_DV = 4,
FFMPEG_PRESET_H264 = 5,
FFMPEG_PRESET_THEORA = 6,
FFMPEG_PRESET_XVID = 7,
};
struct IDProperty;
struct RenderData;
struct RenderData;
struct ReportList;
struct Scene;

16
source/blender/blenkernel/intern/writeffmpeg.c
View File

@ -298,16 +298,6 @@ static const char **get_file_extensions(int format)
static const char *rv[] = { ".ogv", ".ogg", NULL };
return rv;
}
case FFMPEG_MP3:
{
static const char *rv[] = { ".mp3", NULL };
return rv;
}
case FFMPEG_WAV:
{
static const char *rv[] = { ".wav", NULL };
return rv;
}
default:
return NULL;
}
@ -875,12 +865,6 @@ static int start_ffmpeg_impl(struct RenderData *rd, int rectx, int recty, Report
case FFMPEG_FLV:
fmt->video_codec = CODEC_ID_FLV1;
break;
case FFMPEG_MP3:
fmt->audio_codec = CODEC_ID_MP3;
/* fall-through */
case FFMPEG_WAV:
fmt->video_codec = CODEC_ID_NONE;
break;
case FFMPEG_MPEG4:
default:
fmt->video_codec = CODEC_ID_MPEG4;

4
source/blender/blenloader/CMakeLists.txt
View File

@ -66,4 +66,8 @@ if(WITH_INTERNATIONAL)
add_definitions(-DWITH_INTERNATIONAL)
endif()
if(WITH_CODEC_FFMPEG)
add_definitions(-DWITH_FFMPEG)
endif()
blender_add_lib(bf_blenloader "${SRC}" "${INC}" "${INC_SYS}")

3
source/blender/blenloader/SConscript
View File

@ -51,6 +51,9 @@ defs = []
if env['WITH_BF_INTERNATIONAL']:
defs.append('WITH_INTERNATIONAL')
if env['WITH_BF_FFMPEG']:
defs.append('WITH_FFMPEG')
if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'):
env.BlenderLib('bf_blenloader', sources, incs, defs, libtype=['core', 'player'], priority = [167, 30]) #, cc_compileflags=['/WX'])
else:

10
source/blender/blenloader/intern/readfile.c
View File

@ -153,6 +153,7 @@
#include "BKE_tracking.h"
#include "BKE_treehash.h"
#include "BKE_sound.h"
#include "BKE_writeffmpeg.h"
#include "IMB_imbuf.h" // for proxy / timecode versioning stuff
@ -9821,6 +9822,15 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
if (scene->toolsettings->snap_node_mode == SCE_SNAP_MODE_INCREMENT)
scene->toolsettings->snap_node_mode = SCE_SNAP_MODE_GRID;
}
/* Update for removed "sound-only" option in FFMPEG export settings. */
#ifdef WITH_FFMPEG
for (scene = main->scene.first; scene; scene = scene->id.next) {
if (scene->r.ffcodecdata.type >= FFMPEG_INVALID) {
scene->r.ffcodecdata.type = FFMPEG_AVI;
}
}
#endif
}
/* WATCH IT!!!: pointers from libdata have not been converted yet here! */

2
source/blender/makesrna/intern/rna_scene.c
View File

@ -3776,8 +3776,6 @@ static void rna_def_scene_ffmpeg_settings(BlenderRNA *brna)
{FFMPEG_OGG, "OGG", 0, "Ogg", ""},
{FFMPEG_MKV, "MKV", 0, "Matroska", ""},
{FFMPEG_FLV, "FLASH", 0, "Flash", ""},
{FFMPEG_WAV, "WAV", 0, "Wav", ""},
{FFMPEG_MP3, "MP3", 0, "Mp3", ""},
{0, NULL, 0, NULL, NULL}
};