openshot/libopenshot
0
0
Fork 0
mirror of https://github.com/OpenShot/libopenshot.git synced 2026-03-02 08:53:52 -08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed bug on JSON output on a ChunkWriter. Also, moved some ChunkWriter defaults into the header.

Browse Source
This commit is contained in:
Jonathan Thomas
2013-08-28 17:00:57 -05:00
parent ae8552fdb3
commit 12ca79ce0b
3 changed files with 39 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/ChunkWriter.h
View File

@@ -50,6 +50,9 @@ namespace openshot
FFmpegWriter *writer_preview;
FFmpegWriter *writer_final;
tr1::shared_ptr<Frame> last_frame;
string default_extension;
string default_vcodec;
string default_acodec;
/// check for chunk folder
bool create_folder(string path);

25
src/ChunkWriter.cpp
View File

@@ -10,7 +10,8 @@
using namespace openshot;
ChunkWriter::ChunkWriter(string path, FileReaderBase *reader) throw (InvalidFile, InvalidFormat, InvalidCodec, InvalidOptions, OutOfMemory) :
local_reader(reader), path(path), chunk_size(24 * 3), chunk_count(1), frame_count(1), is_writing(false)
local_reader(reader), path(path), chunk_size(24 * 3), chunk_count(1), frame_count(1), is_writing(false),
default_extension(".webm"), default_vcodec("libvpx"), default_acodec("libvorbis")
{
// Init FileInfo struct (clear all values)
InitFileInfo();
@@ -60,21 +61,21 @@ void ChunkWriter::WriteFrame(tr1::shared_ptr<Frame> frame)
// Create FFmpegWriter (FINAL quality)
create_folder(get_chunk_path(chunk_count, "final", ""));
writer_final = new FFmpegWriter(get_chunk_path(chunk_count, "final", ".webm"));
writer_final->SetAudioOptions(true, "libvorbis", info.sample_rate, info.channels, info.audio_bit_rate);
writer_final->SetVideoOptions(true, "libvpx", info.fps, info.width, info.height, info.pixel_ratio, false, false, info.video_bit_rate);
writer_final = new FFmpegWriter(get_chunk_path(chunk_count, "final", default_extension));
writer_final->SetAudioOptions(true, default_acodec, info.sample_rate, info.channels, info.audio_bit_rate);
writer_final->SetVideoOptions(true, default_vcodec, info.fps, info.width, info.height, info.pixel_ratio, false, false, info.video_bit_rate);
// Create FFmpegWriter (PREVIEW quality)
create_folder(get_chunk_path(chunk_count, "preview", ""));
writer_preview = new FFmpegWriter(get_chunk_path(chunk_count, "preview", ".webm"));
writer_preview->SetAudioOptions(true, "libvorbis", info.sample_rate, info.channels, info.audio_bit_rate);
writer_preview->SetVideoOptions(true, "libvpx", info.fps, info.width * 0.5, info.height * 0.5, info.pixel_ratio, false, false, info.video_bit_rate * 0.5);
writer_preview = new FFmpegWriter(get_chunk_path(chunk_count, "preview", default_extension));
writer_preview->SetAudioOptions(true, default_acodec, info.sample_rate, info.channels, info.audio_bit_rate);
writer_preview->SetVideoOptions(true, default_vcodec, info.fps, info.width * 0.5, info.height * 0.5, info.pixel_ratio, false, false, info.video_bit_rate * 0.5);
// Create FFmpegWriter (LOW quality)
create_folder(get_chunk_path(chunk_count, "thumb", ""));
writer_thumb = new FFmpegWriter(get_chunk_path(chunk_count, "thumb", ".webm"));
writer_thumb->SetAudioOptions(true, "libvorbis", info.sample_rate, info.channels, info.audio_bit_rate);
writer_thumb->SetVideoOptions(true, "libvpx", info.fps, info.width * 0.25, info.height * 0.25, info.pixel_ratio, false, false, info.video_bit_rate * 0.25);
writer_thumb = new FFmpegWriter(get_chunk_path(chunk_count, "thumb", default_extension));
writer_thumb->SetAudioOptions(true, default_acodec, info.sample_rate, info.channels, info.audio_bit_rate);
writer_thumb->SetVideoOptions(true, default_vcodec, info.fps, info.width * 0.25, info.height * 0.25, info.pixel_ratio, false, false, info.video_bit_rate * 0.25);
// Prepare Streams
@@ -186,7 +187,7 @@ void ChunkWriter::write_json_meta_data()
root["display_ratio"] = Json::Value(Json::objectValue);
root["display_ratio"]["num"] = local_reader->info.display_ratio.num;
root["display_ratio"]["den"] = local_reader->info.display_ratio.den;
root["vcodec"] = local_reader->info.vcodec;
root["vcodec"] = default_vcodec;
stringstream video_length_stream;
video_length_stream << local_reader->info.video_length;
root["video_length"] = video_length_stream.str();
@@ -196,7 +197,7 @@ void ChunkWriter::write_json_meta_data()
root["video_timebase"]["den"] = local_reader->info.video_timebase.den;
root["interlaced_frame"] = local_reader->info.interlaced_frame;
root["top_field_first"] = local_reader->info.top_field_first;
root["acodec"] = local_reader->info.acodec;
root["acodec"] = default_acodec;
root["audio_bit_rate"] = local_reader->info.audio_bit_rate;
root["sample_rate"] = local_reader->info.sample_rate;
root["channels"] = local_reader->info.channels;

24
src/Main.cpp
View File

@@ -32,7 +32,29 @@ int main(int argc, char* argv[])
cr1.Open();
//for (int z1 = 70; z1 < 85; z1++)
// cr1.GetFrame(z1)->Display();
cr1.GetFrame(300)->Display();
//cr1.GetFrame(300)->Display();
/* WRITER ---------------- */
FFmpegWriter w9("/home/jonathan/fromchunks.webm");
// Set options
w9.SetAudioOptions(true, cr1.info.acodec, cr1.info.sample_rate, cr1.info.channels, cr1.info.audio_bit_rate);
w9.SetVideoOptions(true, cr1.info.vcodec, cr1.info.fps, cr1.info.width, cr1.info.height, cr1.info.pixel_ratio, false, false, cr1.info.video_bit_rate);
// Prepare Streams
w9.PrepareStreams();
// Write header
w9.WriteHeader();
// Create a FFmpegWriter
w9.WriteFrame(&cr1, 1, cr1.info.video_length - 48);
// Write Footer
w9.WriteTrailer();
w9.Close();
cout << "End Chunk Reader" << endl;