File tree Expand file tree Collapse file tree 2 files changed +2
-4
lines changed Expand file tree Collapse file tree 2 files changed +2
-4
lines changed Original file line number Diff line number Diff line change @@ -42,13 +42,11 @@ MediaPlayer::MediaPlayer()
42
42
pthread_mutex_init (&mLock , NULL );
43
43
mLeftVolume = mRightVolume = 1.0 ;
44
44
mVideoWidth = mVideoHeight = 0 ;
45
- mVideoQueue = new PacketQueue ();
46
45
sPlayer = this ;
47
46
}
48
47
49
48
MediaPlayer::~MediaPlayer ()
50
49
{
51
- free (mVideoQueue );
52
50
if (mListener != NULL ) {
53
51
free (mListener );
54
52
}
Original file line number Diff line number Diff line change 6
6
#include < jni.h>
7
7
#include < android/Errors.h>
8
8
9
- #include " packetqueue .h"
9
+ #include " renderer .h"
10
10
#include " decoder_audio.h"
11
11
#include " decoder_video.h"
12
12
@@ -152,7 +152,6 @@ class MediaPlayer
152
152
153
153
double mTime ;
154
154
pthread_mutex_t mLock ;
155
- pthread_t mVideoThread ;
156
155
pthread_t mPlayerThread ;
157
156
PacketQueue* mVideoQueue ;
158
157
// Mutex mNotifyLock;
@@ -163,6 +162,7 @@ class MediaPlayer
163
162
int mVideoStreamIndex ;
164
163
DecoderAudio* mDecoderAudio ;
165
164
DecoderVideo* mDecoderVideo ;
165
+ Renderer* mRenderer ;
166
166
void * mCookie ;
167
167
media_player_states mCurrentState ;
168
168
int mDuration ;
You can’t perform that action at this time.
0 commit comments