2.0 ffmpeg_producer: Removed unused code.

git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches/2.0.0.2@1221 362d55ac-95cf-4e76-9f9a-cbaa9c17b72d

diff --git a/modules/ffmpeg/producer/util.cpp b/modules/ffmpeg/producer/util.cpp
index e52997a3e5a74e1bafa2499ea37ba63f087d7b7e..4a5782dd7df274dc3eba1da7f9104121947d2d8b 100644 (file)
--- a/modules/ffmpeg/producer/util.cpp
+++ b/modules/ffmpeg/producer/util.cpp
@@ -197,67 +197,9 @@ safe_ptr<core::write_frame> make_write_frame(const void* tag, const safe_ptr<AVF
 \r
                        write->commit(n);\r
                }\r
-\r
-               //for(int n = 0; n < static_cast<int>(desc.planes.size()); ++n)\r
-               //{\r
-               //      auto plane            = desc.planes[n];\r
-               //      auto result           = write->image_data(n).begin();\r
-               //      auto decoded          = decoded_frame->data[n];\r
-               //      auto decoded_linesize = decoded_frame->linesize[n];\r
-               //              \r
-               //      for(size_t y = 0; y < static_cast<int>(desc.planes[n].height); ++y)\r
-               //              fast_memcpy(result + y*plane.linesize, decoded + y*decoded_linesize, plane.linesize);\r
-\r
-               //      write->commit(n);\r
-               //}\r
-\r
+               \r
                return write;\r
        }\r
 }\r
 \r
-bool is_sane_frame_rate(AVRational time_base)\r
-{\r
-       return true;\r
-}\r
-\r
-//TODO: Not finished\r
-void fix_meta_data(AVFormatContext& context)\r
-{\r
-       auto video_index = av_find_best_stream(&context, AVMEDIA_TYPE_VIDEO, -1, -1, 0, 0);\r
-       auto audio_index = av_find_best_stream(&context, AVMEDIA_TYPE_AUDIO, -1, -1, 0, 0);\r
-\r
-       if(video_index > -1)\r
-       {\r
-               auto& video_stream  = *context.streams[video_index];\r
-\r
-               if(video_stream.time_base.num == 1)\r
-                       video_stream.time_base.num = static_cast<int>(std::pow(10.0, static_cast<int>(std::log10(static_cast<float>(video_stream.time_base.den)))-1));  \r
-                                       \r
-               if(boost::filesystem2::path(context.filename).extension() == ".flv")\r
-               {\r
-                       try\r
-                       {\r
-                               //auto meta = read_flv_meta_info(context.filename);\r
-                               //fps_ = boost::lexical_cast<double>(meta["framerate"]);\r
-                               //video_stream.nb_frames = static_cast<int64_t>(boost::lexical_cast<double>(meta["duration"])*fps_);\r
-                       }\r
-                       catch(...){}\r
-               }\r
-               else\r
-               {\r
-                       if(video_stream.nb_frames == 0)\r
-                               video_stream.nb_frames = video_stream.duration;\r
-               }\r
-\r
-               if(!is_sane_frame_rate(video_stream.time_base))\r
-               {\r
-                       if(audio_index > -1)\r
-                       {\r
-                               video_stream.time_base.num = video_stream.nb_frames;\r
-                               video_stream.time_base.den = context.streams[audio_index]->duration / context.streams[audio_index]->codec->sample_rate;\r
-                       }\r
-               }\r
-       }\r
-}\r
-\r
 }
\ No newline at end of file

diff --git a/modules/ffmpeg/producer/util.h b/modules/ffmpeg/producer/util.h
index 5d01bd195af09ff16d5fabe21610c148ffe930ad..f96117fc703a8b831b554b6a86384a05d2070c0b 100644 (file)
--- a/modules/ffmpeg/producer/util.h
+++ b/modules/ffmpeg/producer/util.h
@@ -31,6 +31,4 @@ core::pixel_format_desc               get_pixel_format_desc(PixelFormat pix_fmt, size_t width
 int                                                    make_alpha_format(int format); // NOTE: Be careful about CASPAR_PIX_FMT_LUMA, change it to PIX_FMT_GRAY8 if you want to use the frame inside some ffmpeg function.\r
 safe_ptr<core::write_frame> make_write_frame(const void* tag, const safe_ptr<AVFrame>& decoded_frame, const safe_ptr<core::frame_factory>& frame_factory, int hints);\r
 \r
-void                                           fix_meta_data(AVFormatContext& context);\r
-\r
 }
\ No newline at end of file