casa-mp-base
Public
Commits
Michael Dickens authored f33527e0a8f
| 1 - | --- libstreamanalyzer/plugins/endplugins/ffmpegendanalyzer.cpp.orig 2013-11-05 18:43:27.000000000 +0100 |
| 2 - | +++ libstreamanalyzer/plugins/endplugins/ffmpegendanalyzer.cpp 2013-11-05 18:45:02.000000000 +0100 |
| 1 + | --- libstreamanalyzer/plugins/endplugins/ffmpegendanalyzer.cpp.orig |
| 2 + | +++ libstreamanalyzer/plugins/endplugins/ffmpegendanalyzer.cpp |
| 3 3 | |
| 4 4 | signed char analyze(AnalysisResult& idx, ::InputStream* in); |
| 5 5 | }; |
| 6 6 | |
| 7 7 | -STRIGI_MUTEX_DEFINE(mutex); |
| 8 8 | +STRIGI_MUTEX_DEFINE(strigi_mutex); |
| 9 9 | |
| 10 10 | static int |
| 11 11 | lockmgr(void **mtx, enum AVLockOp op) { |
| 12 12 | // pre-allocating a single mutex is the only way to get it to work without changing strigi_thread.h |
| 23 23 | + return !!STRIGI_MUTEX_LOCK(&strigi_mutex); |
| 24 24 | case AV_LOCK_RELEASE: |
| 25 25 | - return !!STRIGI_MUTEX_UNLOCK(&mutex); |
| 26 26 | + return !!STRIGI_MUTEX_UNLOCK(&strigi_mutex); |
| 27 27 | case AV_LOCK_DESTROY: |
| 28 28 | - STRIGI_MUTEX_DESTROY(&mutex); |
| 29 29 | + STRIGI_MUTEX_DESTROY(&strigi_mutex); |
| 30 30 | return 0; |
| 31 31 | } |
| 32 32 | return 1; |
| 33 + | |
| 34 + | #endif |
| 35 + | |
| 36 + | if(fc->bit_rate) |
| 37 + | - ar.addValue(factory->bitrateProperty, fc->bit_rate); |
| 38 + | + ar.addValue(factory->bitrateProperty, (int32_t)fc->bit_rate); |
| 39 + | else if (fc->duration!= no_bitrate && fc->duration > 0) { |
| 40 + | cout<<"Trying to estimate bitrate\n"; |
| 41 + | int64_t size; |
| 42 + | |
| 43 + | outs << stream.r_frame_rate.num / stream.r_frame_rate.den; |
| 44 + | ar.addTriplet(streamuri, frameRatePropertyName, outs.str()); |
| 45 + | } |
| 46 + | - if (codec.pix_fmt != PIX_FMT_NONE) {}//FIXME pixel format |
| 47 + | + if (codec.pix_fmt != AV_PIX_FMT_NONE) {}//FIXME pixel format |
| 48 + | } |
| 49 + | |
| 50 + | } |