Skip to content

Commit 14b58e6

Browse files
authored
undo everything fuck you ffmpeg 🖕🖕🖕🖕
1 parent 563a3dd commit 14b58e6

File tree

2 files changed

+14
-29
lines changed

2 files changed

+14
-29
lines changed

.github/workflows/multi-platform.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,17 @@ jobs:
1515
- name: Windows
1616
os: windows-latest
1717

18-
# - name: macOS
19-
# os: macos-latest
18+
- name: macOS
19+
os: macos-latest
2020

21-
# - name: Android32
22-
# os: ubuntu-latest
23-
# target: Android32
24-
# min-sdk: 24
21+
- name: Android32
22+
os: ubuntu-latest
23+
target: Android32
24+
min-sdk: 24
2525

26-
# - name: Android64
27-
# os: ubuntu-latest
28-
# target: Android64
26+
- name: Android64
27+
os: ubuntu-latest
28+
target: Android64
2929

3030
name: ${{ matrix.config.name }}
3131
runs-on: ${{ matrix.config.os }}

src/recorder.cpp

Lines changed: 5 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -209,8 +209,6 @@ bool Recorder::init(const RenderSettings& settings) {
209209

210210
m_init = true;
211211

212-
av_log_set_level(AV_LOG_DEBUG);
213-
214212
return true;
215213
}
216214

@@ -255,30 +253,17 @@ bool Recorder::writeFrame(const std::vector<uint8_t>& frameData) {
255253
av_packet_unref(m_packet);
256254
}
257255

258-
av_frame_free(&m_filteredFrame);
259-
260256
return true;
261257
}
262258

263259
void Recorder::filterFrame(AVFrame* inputFrame, AVFrame* outputFrame) {
264-
int ret = av_buffersrc_add_frame_flags(m_buffersrcCtx, inputFrame, 0);
265-
if (ret < 0) {
266-
char errbuf[AV_ERROR_MAX_STRING_SIZE];
267-
av_strerror(ret, errbuf, AV_ERROR_MAX_STRING_SIZE);
260+
if (av_buffersrc_add_frame(m_buffersrcCtx, inputFrame) < 0) {
261+
std::cerr << "Error feeding frame to filter graph.\n";
268262
avfilter_graph_free(&m_filterGraph);
269-
geode::log::error("Error while feeding frame to filter graph: {}", errbuf);
270263
return;
271264
}
272265

273-
while(true) {
274-
ret = av_buffersink_get_frame(m_buffersinkCtx, outputFrame);
275-
276-
outputFrame->time_base = av_buffersink_get_time_base(m_buffersinkCtx);
277-
278-
if (ret == AVERROR(EAGAIN) || ret == AVERROR_EOF) {
279-
break;
280-
}
281-
}
266+
av_buffersink_get_frame(m_buffersinkCtx, outputFrame);
282267
}
283268

284269
void Recorder::stop() {
@@ -307,10 +292,10 @@ void Recorder::stop() {
307292

308293
if(m_filterGraph) {
309294
avfilter_graph_free(&m_filterGraph);
310-
// av_frame_free(&m_filteredFrame);
295+
av_frame_free(&m_filteredFrame);
311296
}
312297

313298
delete m_packet;
314299
}
315300

316-
}
301+
}

0 commit comments

Comments
 (0)