Skip to content

Commit 082c8f5

Browse files
authored
Merge the internal implementation of FilterGraph (#657)
1 parent 17dd8e8 commit 082c8f5

File tree

8 files changed

+168
-437
lines changed

8 files changed

+168
-437
lines changed

src/libspdl/core/detail/ffmpeg/decoder.cpp

+2-5
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ Generator<AVFramePtr> _decode_packet(
9292
Generator<AVFramePtr> decode_packets(
9393
AVCodecContextPtr& codec_ctx,
9494
const std::vector<AVPacket*>& packets,
95-
std::optional<FilterGraph>& filter,
95+
std::optional<FilterGraphImpl>& filter,
9696
bool flush) {
9797
auto packet_stream = _stream_packet(packets, flush);
9898
if (!filter) {
@@ -132,10 +132,7 @@ DecoderImpl<media>::DecoderImpl(
132132
codec.get_time_base(),
133133
cfg ? cfg->decoder : std::nullopt,
134134
cfg ? cfg->decoder_options : std::nullopt)),
135-
filter_graph(get_filter<media>(
136-
codec_ctx.get(),
137-
filter_desc,
138-
codec.get_frame_rate())) {}
135+
filter_graph(filter_desc) {}
139136

140137
template <MediaType media>
141138
Rational DecoderImpl<media>::get_output_time_base() const {

src/libspdl/core/detail/ffmpeg/decoder.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ namespace spdl::core::detail {
2424
template <MediaType media>
2525
class DecoderImpl {
2626
AVCodecContextPtr codec_ctx;
27-
std::optional<FilterGraph> filter_graph;
27+
std::optional<FilterGraphImpl> filter_graph;
2828

2929
public:
3030
DecoderImpl(

0 commit comments

Comments
 (0)