Skip to content

Commit acc42e4

Browse files
author
xufuji456
committed
Feature: add FFMessageQueue
1 parent 6ce7f8e commit acc42e4

4 files changed

Lines changed: 228 additions & 102 deletions

File tree

app/src/main/cpp/ffplayer/ffmsg_queue.h renamed to app/src/main/cpp/ffplayer/FFMessageQueue.cpp

Lines changed: 41 additions & 100 deletions
Original file line numberDiff line numberDiff line change
@@ -1,65 +1,8 @@
1+
//
2+
// Created by xu fulong on 2022/9/24.
3+
//
14

2-
#ifndef FFMSG_QUEUE_H
3-
#define FFMSG_QUEUE_H
4-
5-
#include <mutex>
6-
#include <libavutil/mem.h>
7-
8-
/**************** msg define begin ***************/
9-
10-
#define FFP_MSG_FLUSH 0
11-
#define FFP_MSG_ERROR 100
12-
#define FFP_MSG_PREPARED 200
13-
#define FFP_MSG_COMPLETED 300
14-
#define FFP_MSG_VIDEO_SIZE_CHANGED 400
15-
#define FFP_MSG_SAR_CHANGED 401
16-
#define FFP_MSG_VIDEO_RENDERING_START 402
17-
#define FFP_MSG_AUDIO_RENDERING_START 403
18-
#define FFP_MSG_VIDEO_ROTATION_CHANGED 404
19-
#define FFP_MSG_AUDIO_DECODED_START 405
20-
#define FFP_MSG_VIDEO_DECODED_START 406
21-
#define FFP_MSG_OPEN_INPUT 407
22-
#define FFP_MSG_FIND_STREAM_INFO 408
23-
#define FFP_MSG_COMPONENT_OPEN 409
24-
#define FFP_MSG_VIDEO_SEEK_RENDERING_START 410
25-
#define FFP_MSG_AUDIO_SEEK_RENDERING_START 411
26-
27-
#define FFP_MSG_BUFFERING_START 500
28-
#define FFP_MSG_BUFFERING_END 501
29-
#define FFP_MSG_BUFFERING_UPDATE 502
30-
#define FFP_MSG_BUFFERING_BYTES_UPDATE 503
31-
#define FFP_MSG_BUFFERING_TIME_UPDATE 504
32-
#define FFP_MSG_SEEK_COMPLETE 600
33-
#define FFP_MSG_PLAYBACK_STATE_CHANGED 700
34-
#define FFP_MSG_TIMED_TEXT 800
35-
#define FFP_MSG_VIDEO_DECODER_OPEN 900
36-
37-
#define FFP_REQ_START 1001
38-
#define FFP_REQ_PAUSE 1002
39-
#define FFP_REQ_SEEK 1003
40-
41-
/**************** msg define end *****************/
42-
43-
typedef struct AVMessage {
44-
int what;
45-
int arg1;
46-
int arg2;
47-
void *obj;
48-
void (*free_l)(void *obj);
49-
struct AVMessage *next;
50-
} AVMessage;
51-
52-
typedef struct MessageQueue {
53-
AVMessage *first_msg, *last_msg;
54-
int nb_messages;
55-
int abort_request;
56-
std::mutex mutex;
57-
std::condition_variable cond;
58-
59-
AVMessage *recycle_msg;
60-
int recycle_count;
61-
int alloc_count;
62-
} MessageQueue;
5+
#include "FFMessageQueue.h"
636

647
inline static void msg_free(AVMessage *msg) {
658
if (!msg || !msg->obj)
@@ -113,36 +56,22 @@ inline static void msg_init_msg(AVMessage *msg) {
11356
memset(msg, 0, sizeof(AVMessage));
11457
}
11558

116-
inline static void msg_queue_put_notify1(MessageQueue *q, int what) {
117-
AVMessage msg;
118-
msg_init_msg(&msg);
119-
msg.what = what;
120-
msg_queue_put(q, &msg);
59+
void FFMessageQueue::init() {
60+
memset(q, 0, sizeof(MessageQueue));
61+
q->abort_request = 1;
12162
}
12263

123-
inline static void msg_queue_put_notify2(MessageQueue *q, int what, int arg1) {
124-
AVMessage msg;
125-
msg_init_msg(&msg);
126-
msg.what = what;
127-
msg.arg1 = arg1;
128-
msg_queue_put(q, &msg);
129-
}
64+
void FFMessageQueue::start() {
65+
std::lock_guard<std::mutex> lock(q->mutex);
66+
q->abort_request = 0;
13067

131-
inline static void msg_queue_put_notify3(MessageQueue *q, int what, int arg1, int arg2) {
13268
AVMessage msg;
13369
msg_init_msg(&msg);
134-
msg.what = what;
135-
msg.arg1 = arg1;
136-
msg.arg2 = arg2;
137-
msg_queue_put(q, &msg);
138-
}
139-
140-
inline static void msg_queue_init(MessageQueue *q) {
141-
memset(q, 0, sizeof(MessageQueue));
142-
q->abort_request = 1;
70+
msg.what = FFP_MSG_FLUSH;
71+
msg_queue_put_private(q, &msg);
14372
}
14473

145-
inline static void msg_queue_flush(MessageQueue *q) {
74+
void FFMessageQueue::flush() {
14675
AVMessage *msg, *msg1;
14776
std::lock_guard<std::mutex> lock(q->mutex);
14877

@@ -156,23 +85,31 @@ inline static void msg_queue_flush(MessageQueue *q) {
15685
q->nb_messages = 0;
15786
}
15887

159-
inline static void msg_queue_abort(MessageQueue *q) {
160-
std::unique_lock<std::mutex> lock(q->mutex);
161-
q->abort_request = 1;
162-
q->cond.notify_all();
88+
void FFMessageQueue::sendMessage1(int what) {
89+
AVMessage msg;
90+
msg_init_msg(&msg);
91+
msg.what = what;
92+
msg_queue_put(q, &msg);
16393
}
16494

165-
inline static void msg_queue_start(MessageQueue *q) {
166-
std::lock_guard<std::mutex> lock(q->mutex);
167-
q->abort_request = 0;
95+
void FFMessageQueue::sendMessage2(int what, int arg1) {
96+
AVMessage msg;
97+
msg_init_msg(&msg);
98+
msg.what = what;
99+
msg.arg1 = arg1;
100+
msg_queue_put(q, &msg);
101+
}
168102

103+
void FFMessageQueue::sendMessage3(int what, int arg1, int arg2) {
169104
AVMessage msg;
170105
msg_init_msg(&msg);
171-
msg.what = FFP_MSG_FLUSH;
172-
msg_queue_put_private(q, &msg);
106+
msg.what = what;
107+
msg.arg1 = arg1;
108+
msg.arg2 = arg2;
109+
msg_queue_put(q, &msg);
173110
}
174111

175-
inline static int msg_queue_get(MessageQueue *q, AVMessage *msg, int block) {
112+
int FFMessageQueue::get(AVMessage *msg, int block) {
176113
AVMessage *msg1;
177114
int ret;
178115

@@ -207,7 +144,7 @@ inline static int msg_queue_get(MessageQueue *q, AVMessage *msg, int block) {
207144
return ret;
208145
}
209146

210-
inline static void msg_queue_remove(MessageQueue *q, int what) {
147+
void FFMessageQueue::remove(int what) {
211148
AVMessage **p_msg, *msg, *last_msg;
212149
std::lock_guard<std::mutex> lock(q->mutex);
213150

@@ -238,8 +175,14 @@ inline static void msg_queue_remove(MessageQueue *q, int what) {
238175
}
239176
}
240177

241-
inline static void msg_queue_destroy(MessageQueue *q) {
242-
msg_queue_flush(q);
178+
void FFMessageQueue::abort() {
179+
std::unique_lock<std::mutex> lock(q->mutex);
180+
q->abort_request = 1;
181+
q->cond.notify_all();
182+
}
183+
184+
void FFMessageQueue::destroy() {
185+
flush();
243186
std::lock_guard<std::mutex> lock(q->mutex);
244187

245188
while(q->recycle_msg) {
@@ -249,6 +192,4 @@ inline static void msg_queue_destroy(MessageQueue *q) {
249192
msg_free(msg);
250193
av_freep(&msg);
251194
}
252-
}
253-
254-
#endif // FFMSG_QUEUE_H
195+
}
Lines changed: 96 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,96 @@
1+
//
2+
// Created by xu fulong on 2022/9/24.
3+
//
4+
5+
#ifndef FFMPEGANDROID_FFMESSAGEQUEUE_H
6+
#define FFMPEGANDROID_FFMESSAGEQUEUE_H
7+
8+
#include <mutex>
9+
#include <libavutil/mem.h>
10+
11+
/**************** msg define begin ***************/
12+
13+
#define FFP_MSG_FLUSH 0
14+
#define FFP_MSG_ERROR 100
15+
#define FFP_MSG_PREPARED 200
16+
#define FFP_MSG_COMPLETED 300
17+
#define FFP_MSG_VIDEO_SIZE_CHANGED 400
18+
#define FFP_MSG_SAR_CHANGED 401
19+
#define FFP_MSG_VIDEO_RENDERING_START 402
20+
#define FFP_MSG_AUDIO_RENDERING_START 403
21+
#define FFP_MSG_VIDEO_ROTATION_CHANGED 404
22+
#define FFP_MSG_AUDIO_DECODED_START 405
23+
#define FFP_MSG_VIDEO_DECODED_START 406
24+
#define FFP_MSG_OPEN_INPUT 407
25+
#define FFP_MSG_FIND_STREAM_INFO 408
26+
#define FFP_MSG_COMPONENT_OPEN 409
27+
#define FFP_MSG_VIDEO_SEEK_RENDERING_START 410
28+
#define FFP_MSG_AUDIO_SEEK_RENDERING_START 411
29+
30+
#define FFP_MSG_BUFFERING_START 500
31+
#define FFP_MSG_BUFFERING_END 501
32+
#define FFP_MSG_BUFFERING_UPDATE 502
33+
#define FFP_MSG_BUFFERING_BYTES_UPDATE 503
34+
#define FFP_MSG_BUFFERING_TIME_UPDATE 504
35+
#define FFP_MSG_SEEK_COMPLETE 600
36+
#define FFP_MSG_PLAYBACK_STATE_CHANGED 700
37+
#define FFP_MSG_TIMED_TEXT 800
38+
#define FFP_MSG_VIDEO_DECODER_OPEN 900
39+
40+
#define FFP_REQ_START 1001
41+
#define FFP_REQ_PAUSE 1002
42+
#define FFP_REQ_SEEK 1003
43+
44+
/**************** msg define end *****************/
45+
46+
typedef struct AVMessage {
47+
int what;
48+
int arg1;
49+
int arg2;
50+
void *obj;
51+
void (*free_l)(void *obj);
52+
struct AVMessage *next;
53+
} AVMessage;
54+
55+
typedef struct MessageQueue {
56+
AVMessage *first_msg, *last_msg;
57+
int nb_messages;
58+
int abort_request;
59+
std::mutex mutex;
60+
std::condition_variable cond;
61+
62+
AVMessage *recycle_msg;
63+
int recycle_count;
64+
int alloc_count;
65+
} MessageQueue;
66+
67+
class FFMessageQueue {
68+
69+
private:
70+
MessageQueue *q;
71+
72+
public:
73+
74+
void init();
75+
76+
void start();
77+
78+
void flush();
79+
80+
void sendMessage1(int what);
81+
82+
void sendMessage2(int what, int arg1);
83+
84+
void sendMessage3(int what, int arg1, int arg2);
85+
86+
int get(AVMessage *msg, int block);
87+
88+
void remove(int what);
89+
90+
void abort();
91+
92+
void destroy();
93+
};
94+
95+
96+
#endif //FFMPEGANDROID_FFMESSAGEQUEUE_H

‎app/src/main/cpp/ffplayer/ffplay_define.h‎

Lines changed: 90 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,97 @@
55
#ifndef FFMPEGANDROID_FFPLAY_DEFINE_H
66
#define FFMPEGANDROID_FFPLAY_DEFINE_H
77

8-
#define PACKET_QUEUE_SIZE 16
8+
#include <mutex>
9+
#include "FFMessageQueue.h"
10+
11+
#ifdef __cplusplus
12+
extern "C" {
13+
#endif
14+
#include <libavformat/avformat.h>
15+
#ifdef __cplusplus
16+
}
17+
#endif
918

19+
#define PACKET_QUEUE_SIZE 16
1020
#define FRAME_QUEUE_SIZE 16
1121

22+
#define VIDEO_QUEUE_SIZE 5
23+
#define SAMPLE_QUEUE_SIZE 9
24+
25+
#define MAX_QUEUE_SIZE (15 * 1024 * 1024)
26+
#define MIN_FRAMES 25
27+
28+
#define AUDIO_MIN_BUFFER_SIZE 512
29+
#define AUDIO_MAX_CALLBACKS_PER_SEC 30
30+
31+
#define REFRESH_RATE 0.01
32+
33+
#define AV_SYNC_THRESHOLD_MIN 0.04
34+
#define AV_SYNC_THRESHOLD_MAX 0.1
35+
#define AV_SYNC_FRAMEDUP_THRESHOLD 0.1
36+
#define AV_NOSYNC_THRESHOLD 10.0
37+
38+
#define EXTERNAL_CLOCK_MIN_FRAMES 2
39+
#define EXTERNAL_CLOCK_MAX_FRAMES 10
40+
#define EXTERNAL_CLOCK_SPEED_MIN 0.900
41+
#define EXTERNAL_CLOCK_SPEED_MAX 1.010
42+
#define EXTERNAL_CLOCK_SPEED_STEP 0.001
43+
44+
struct AVDictionary {
45+
int count;
46+
AVDictionaryEntry *elements;
47+
};
48+
49+
typedef enum {
50+
AV_SYNC_AUDIO, // 同步到音频时钟
51+
AV_SYNC_VIDEO, // 同步到视频时钟
52+
AV_SYNC_EXTERNAL, // 同步到外部时钟
53+
} SyncType;
54+
55+
class PlayerParams {
56+
57+
public:
58+
std::mutex mutex;
59+
60+
MessageQueue *messageQueue;
61+
int64_t videoDuration;
62+
63+
AVInputFormat *iformat;
64+
const char *url;
65+
int64_t offset;
66+
const char *headers;
67+
68+
const char *audioCodecName;
69+
const char *videoCodecName;
70+
71+
int abortRequest;
72+
int pauseRequest;
73+
SyncType syncType;
74+
int64_t startTime;
75+
int64_t duration;
76+
int realTime;
77+
int infiniteBuffer;
78+
int audioDisable;
79+
int videoDisable;
80+
int displayDisable;
81+
82+
int fast;
83+
int genpts;
84+
int lowres;
85+
86+
float playbackRate;
87+
float playbackPitch;
88+
89+
int seekByBytes;
90+
int seekRequest;
91+
int seekFlags;
92+
int64_t seekPos;
93+
int64_t seekRel;
94+
95+
int autoExit;
96+
int loop;
97+
int mute;
98+
int reorderVideoPts;
99+
};
100+
12101
#endif //FFMPEGANDROID_FFPLAY_DEFINE_H

‎app/src/main/cpp/ffplayer/queue/FrameQueue.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#define FFMPEGANDROID_FRAMEQUEUE_H
44

55
#include <mutex>
6-
#include "ffplayer/ffplay_define.h"
6+
#include "ffplay_define.h"
77

88
extern "C" {
99
#include "libavcodec/avcodec.h"

0 commit comments

Comments
 (0)