From 995abf233bdff53f7066b0d9917b1296108a13c3 Mon Sep 17 00:00:00 2001 From: Comment Date: Wed, 9 Oct 2013 08:35:46 -0700 Subject: default to non fragmented movie --- rotord/src/libavwrapper.cpp | 10 ++++++++-- rotord/src/libavwrapper.h | 1 + rotord/src/rotor.h | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) (limited to 'rotord') diff --git a/rotord/src/libavwrapper.cpp b/rotord/src/libavwrapper.cpp index fa09b7f..d9207bb 100644 --- a/rotord/src/libavwrapper.cpp +++ b/rotord/src/libavwrapper.cpp @@ -168,7 +168,7 @@ bool libav::exporter::record(std::string filename){ video_st->time_base = video_st->codec->time_base; //audioStream->time_base = codecCtx->time_base; //???has the capability of crashing - video_st->codec->gop_size = 75; /* emit one intra frame every ten frames */ + video_st->codec->gop_size = 75; /* emit one intra frame every 75 frames */ video_st->codec->pix_fmt = PIX_FMT_YUV420P; @@ -217,7 +217,7 @@ bool libav::exporter::record(std::string filename){ //THIS DOES SEEM TO SET CONTAINER OPTS= AS MOOV_SIZE MAKES THE MOVIE BANJAXED //av_dict_set(&opts, "moov_size", "20000", 0); if (fragmentation) { - av_dict_set(&opts, "movflags","frag_keyframe", 0); + av_dict_set(&opts, "movflags","frag_keyframe", 0); } @@ -361,12 +361,18 @@ AVStream* libav::exporter::add_stream(AVFormatContext *oc, AVCodec **codec,enum case AVMEDIA_TYPE_VIDEO: c->codec_id = codec_id; + + c->bit_rate = bitRate; //need to deal with resolution etc c->rc_max_rate = bitRate; c->rc_min_rate = 0; //c->rc_buffer_size = Profile()->m_videoMaxVopSize; //?? + /* + all taken out 091113 to try to stop making incompatible movies + */ + // Resolution must be a multiple of two. // //c->width = 352; diff --git a/rotord/src/libavwrapper.h b/rotord/src/libavwrapper.h index 6391af9..bf073fc 100644 --- a/rotord/src/libavwrapper.h +++ b/rotord/src/libavwrapper.h @@ -164,6 +164,7 @@ namespace libav { public: exporter(){ sws_ctx = NULL; + fragmentation=false; } virtual ~exporter(){ if (NULL != sws_ctx) { diff --git a/rotord/src/rotor.h b/rotord/src/rotor.h index fcfc304..ebd827a 100644 --- a/rotord/src/rotor.h +++ b/rotord/src/rotor.h @@ -446,7 +446,7 @@ namespace Rotor { create_attribute("filename","name of video file to load","File name",""); create_attribute("frame_mode","frame mode","Frame mode","frame",{"frame","blend"}); create_attribute("time_mode","time mode","Time mode","play",{"play","stretch"}); - create_attribute("media_id","media_id","media_id","media_id"); + create_attribute("media_id","media_id","media_id","media_id"); //for rotorW title="Video loader"; description="Loads a video file"; UID="5b64b8ca-2d0a-11e3-92ed-4b7420b40040"; -- cgit v1.2.3