summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrik Ryd <patrik.ryd@linaro.org>2012-06-26 15:00:31 +0200
committerPatrik Ryd <patrik.ryd@linaro.org>2012-06-26 15:21:37 +0200
commitb3efb5f75b5beb7ac3a8127c3790da542cfecdb0 (patch)
treea6b2da98f0968a8b8d61bb5356b97f9a7b93a147
parentb898a5656275b276bcf01ac06331a876c286a998 (diff)
downloadlibvideoeditor-linaro_android_4.0.4_snowball_mm.tar.gz
Snowball: Adds dummy arguement in open function.linaro_android_4.0.4_snowball_mm
Function arguement added with dummy parameter to take care of changes done for Latency update of output devices. The original patch from ST-Ericsson has been modified by surrounding all changes with STERICSSON_CODEC_SUPPORT. Change-Id: Ia5393bfcfe35ef8974e150dddae319b7b65533c9 Signed-off-by: Patrik Ryd <patrik.ryd@linaro.org>
-rwxr-xr-xlvpp/VideoEditorPlayer.cpp5
-rwxr-xr-xlvpp/VideoEditorPlayer.h6
2 files changed, 10 insertions, 1 deletions
diff --git a/lvpp/VideoEditorPlayer.cpp b/lvpp/VideoEditorPlayer.cpp
index 90a5821..60d09ca 100755
--- a/lvpp/VideoEditorPlayer.cpp
+++ b/lvpp/VideoEditorPlayer.cpp
@@ -380,7 +380,12 @@ status_t VideoEditorPlayer::VeAudioOutput::getPosition(uint32_t *position) {
status_t VideoEditorPlayer::VeAudioOutput::open(
uint32_t sampleRate, int channelCount, int format, int bufferCount,
+#ifdef STERICSSON_CODEC_SUPPORT
+ AudioCallback cb, void *cookie,
+ LatencyCallback latencyCb) {
+#else
AudioCallback cb, void *cookie) {
+#endif
mCallback = cb;
mCallbackCookie = cookie;
diff --git a/lvpp/VideoEditorPlayer.h b/lvpp/VideoEditorPlayer.h
index 6b10b36..014082e 100755
--- a/lvpp/VideoEditorPlayer.h
+++ b/lvpp/VideoEditorPlayer.h
@@ -51,8 +51,12 @@ class VideoEditorPlayer : public MediaPlayerInterface {
virtual status_t open(
uint32_t sampleRate, int channelCount,
int format, int bufferCount,
+#ifdef STERICSSON_CODEC_SUPPORT
+ AudioCallback cb, void *cookie,
+ LatencyCallback latencyCb = NULL);
+#else
AudioCallback cb, void *cookie);
-
+#endif //STERICSSON_CODEC_SUPPORT
virtual void start();
virtual ssize_t write(const void* buffer, size_t size);
virtual void stop();