Skip to content

Commit a89be17

Browse files
committed
adding renderer to mediaplayer class
1 parent 132ba26 commit a89be17

File tree

2 files changed

+2
-4
lines changed

2 files changed

+2
-4
lines changed

jni/libmediaplayer/mediaplayer.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,13 +42,11 @@ MediaPlayer::MediaPlayer()
4242
pthread_mutex_init(&mLock, NULL);
4343
mLeftVolume = mRightVolume = 1.0;
4444
mVideoWidth = mVideoHeight = 0;
45-
mVideoQueue = new PacketQueue();
4645
sPlayer = this;
4746
}
4847

4948
MediaPlayer::~MediaPlayer()
5049
{
51-
free(mVideoQueue);
5250
if(mListener != NULL) {
5351
free(mListener);
5452
}

jni/libmediaplayer/mediaplayer.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#include <jni.h>
77
#include <android/Errors.h>
88

9-
#include "packetqueue.h"
9+
#include "renderer.h"
1010
#include "decoder_audio.h"
1111
#include "decoder_video.h"
1212

@@ -152,7 +152,6 @@ class MediaPlayer
152152

153153
double mTime;
154154
pthread_mutex_t mLock;
155-
pthread_t mVideoThread;
156155
pthread_t mPlayerThread;
157156
PacketQueue* mVideoQueue;
158157
//Mutex mNotifyLock;
@@ -163,6 +162,7 @@ class MediaPlayer
163162
int mVideoStreamIndex;
164163
DecoderAudio* mDecoderAudio;
165164
DecoderVideo* mDecoderVideo;
165+
Renderer* mRenderer;
166166
void* mCookie;
167167
media_player_states mCurrentState;
168168
int mDuration;

0 commit comments

Comments
 (0)