summaryrefslogtreecommitdiff
path: root/src/video_core/host1x/codecs/decoder.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/video_core/host1x/codecs/decoder.h')
-rwxr-xr-xsrc/video_core/host1x/codecs/decoder.h73
1 files changed, 37 insertions, 36 deletions
diff --git a/src/video_core/host1x/codecs/decoder.h b/src/video_core/host1x/codecs/decoder.h
index 22e6db815..c456bbb1b 100755
--- a/src/video_core/host1x/codecs/decoder.h
+++ b/src/video_core/host1x/codecs/decoder.h
@@ -16,49 +16,50 @@
namespace Tegra {
-namespace Host1x {
-class Host1x;
-class FrameQueue;
-} // namespace Host1x
+ namespace Host1x {
+ class Host1x;
+ class FrameQueue;
+ } // namespace Host1x
-class Decoder {
-public:
- virtual ~Decoder();
+ class Decoder {
+ public:
+ virtual ~Decoder();
- /// Call decoders to construct headers, decode AVFrame with ffmpeg
- void Decode();
+ /// Call decoders to construct headers, decode AVFrame with ffmpeg
+ void Decode();
- bool UsingDecodeOrder() const {
- return decode_api.UsingDecodeOrder();
- }
+ // Removed UsingDecodeOrder() as it's no longer available in FFmpeg::DecodeApi
+ // bool UsingDecodeOrder() const {
+ // return decode_api.UsingDecodeOrder();
+ // }
- /// Returns the value of current_codec
- [[nodiscard]] Host1x::NvdecCommon::VideoCodec GetCurrentCodec() const {
- return codec;
- }
+ /// Returns the value of current_codec
+ [[nodiscard]] Host1x::NvdecCommon::VideoCodec GetCurrentCodec() const {
+ return codec;
+ }
- /// Return name of the current codec
- [[nodiscard]] virtual std::string_view GetCurrentCodecName() const = 0;
+ /// Return name of the current codec
+ [[nodiscard]] virtual std::string_view GetCurrentCodecName() const = 0;
-protected:
- explicit Decoder(Host1x::Host1x& host1x, s32 id,
- const Host1x::NvdecCommon::NvdecRegisters& regs,
- Host1x::FrameQueue& frame_queue);
+ protected:
+ explicit Decoder(Host1x::Host1x& host1x, s32 id,
+ const Host1x::NvdecCommon::NvdecRegisters& regs,
+ Host1x::FrameQueue& frame_queue);
- virtual std::span<const u8> ComposeFrame() = 0;
- virtual std::tuple<u64, u64> GetProgressiveOffsets() = 0;
- virtual std::tuple<u64, u64, u64, u64> GetInterlacedOffsets() = 0;
- virtual bool IsInterlaced() = 0;
+ virtual std::span<const u8> ComposeFrame() = 0;
+ virtual std::tuple<u64, u64> GetProgressiveOffsets() = 0;
+ virtual std::tuple<u64, u64, u64, u64> GetInterlacedOffsets() = 0;
+ virtual bool IsInterlaced() = 0;
- Host1x::Host1x& host1x;
- Tegra::MemoryManager& memory_manager;
- const Host1x::NvdecCommon::NvdecRegisters& regs;
- s32 id;
- Host1x::FrameQueue& frame_queue;
- Host1x::NvdecCommon::VideoCodec codec;
- FFmpeg::DecodeApi decode_api;
- bool initialized{};
- bool vp9_hidden_frame{};
-};
+ Host1x::Host1x& host1x;
+ Tegra::MemoryManager& memory_manager;
+ const Host1x::NvdecCommon::NvdecRegisters& regs;
+ s32 id;
+ Host1x::FrameQueue& frame_queue;
+ Host1x::NvdecCommon::VideoCodec codec;
+ FFmpeg::DecodeApi decode_api;
+ bool initialized{};
+ bool vp9_hidden_frame{};
+ };
} // namespace Tegra