aboutsummaryrefslogtreecommitdiffstats
path: root/mediaplugin/src/mediaplugins/ffmpeg
diff options
context:
space:
mode:
authortobigun <tobigun@b956fd51-792f-4845-bead-9b4dfca2ff2c>2010-12-22 11:52:39 +0000
committertobigun <tobigun@b956fd51-792f-4845-bead-9b4dfca2ff2c>2010-12-22 11:52:39 +0000
commit71e7b0bb663197c4bbc4aad55082dd6424e0fb33 (patch)
treec79cc705da2c3e986aa33fed999b236c310c931f /mediaplugin/src/mediaplugins/ffmpeg
parentdbdb5b7e4fc5acd72c9283990a412fffb7bb33c3 (diff)
downloadusdx-71e7b0bb663197c4bbc4aad55082dd6424e0fb33.tar.gz
usdx-71e7b0bb663197c4bbc4aad55082dd6424e0fb33.tar.xz
usdx-71e7b0bb663197c4bbc4aad55082dd6424e0fb33.zip
meld video-frame info (width/height/aspect) to reduce exported functions
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/branches/experimental@2766 b956fd51-792f-4845-bead-9b4dfca2ff2c
Diffstat (limited to 'mediaplugin/src/mediaplugins/ffmpeg')
-rw-r--r--mediaplugin/src/mediaplugins/ffmpeg/ffmpeg_video_decode.cpp21
1 files changed, 8 insertions, 13 deletions
diff --git a/mediaplugin/src/mediaplugins/ffmpeg/ffmpeg_video_decode.cpp b/mediaplugin/src/mediaplugins/ffmpeg/ffmpeg_video_decode.cpp
index b3fc77b3..8107c1b2 100644
--- a/mediaplugin/src/mediaplugins/ffmpeg/ffmpeg_video_decode.cpp
+++ b/mediaplugin/src/mediaplugins/ffmpeg/ffmpeg_video_decode.cpp
@@ -625,16 +625,13 @@ static double PLUGIN_CALL ffmpegVideoDecoder_getPosition(videoDecodeStream_t *st
return VideoDecodeStreamObj(stream)->getPosition();
}
-static int PLUGIN_CALL ffmpegVideoDecoder_getFrameWidth(videoDecodeStream_t *stream) {
- return VideoDecodeStreamObj(stream)->getFrameWidth();
-}
-
-static int PLUGIN_CALL ffmpegVideoDecoder_getFrameHeight(videoDecodeStream_t *stream) {
- return VideoDecodeStreamObj(stream)->getFrameHeight();
-}
-
-static double PLUGIN_CALL ffmpegVideoDecoder_getFrameAspect(videoDecodeStream_t *stream) {
- return VideoDecodeStreamObj(stream)->getFrameAspect();
+static void PLUGIN_CALL ffmpegVideoDecoder_getFrameInfo(videoDecodeStream_t *stream,
+ videoFrameInfo_t *info)
+{
+ FFmpegVideoDecodeStream* s = VideoDecodeStreamObj(stream);
+ info->width = s->getFrameWidth();
+ info->height = s->getFrameHeight();
+ info->aspect = s->getFrameAspect();
}
static uint8_t* PLUGIN_CALL ffmpegVideoDecoder_getFrame(videoDecodeStream_t *stream, long double time) {
@@ -655,8 +652,6 @@ const videoDecoderInfo_t videoDecoderInfo = {
ffmpegVideoDecoder_getLoop,
ffmpegVideoDecoder_setPosition,
ffmpegVideoDecoder_getPosition,
- ffmpegVideoDecoder_getFrameWidth,
- ffmpegVideoDecoder_getFrameHeight,
- ffmpegVideoDecoder_getFrameAspect,
+ ffmpegVideoDecoder_getFrameInfo,
ffmpegVideoDecoder_getFrame
};