From: Steinar H. Gunderson <sgunderson@bigfoot.com>
Date: Tue, 2 Aug 2016 20:46:01 +0000 (+0200)
Subject: Run IWYU on quicksync_encoder.{cpp,h}.
X-Git-Tag: 1.3.4~1
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=156470e2dca8813f8eb736f52363e94501ab36f5;p=nageru

Run IWYU on quicksync_encoder.{cpp,h}.
---

diff --git a/quicksync_encoder.cpp b/quicksync_encoder.cpp
index 5bba546..55a0eab 100644
--- a/quicksync_encoder.cpp
+++ b/quicksync_encoder.cpp
@@ -1,18 +1,22 @@
 //#include "sysdeps.h"
 #include "quicksync_encoder.h"
 
-#include <movit/resource_pool.h>
+#include <movit/resource_pool.h>  // Must be above the Xlib includes.
 #include <movit/util.h>
+
 #include <EGL/eglplatform.h>
-#include <X11/X.h>
 #include <X11/Xlib.h>
 #include <assert.h>
 #include <epoxy/egl.h>
+#include <fcntl.h>
+#include <libavcodec/avcodec.h>
+#include <libavformat/avio.h>
+#include <libavutil/error.h>
 #include <libdrm/drm_fourcc.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <fcntl.h>
+#include <unistd.h>
 #include <va/va.h>
 #include <va/va_drm.h>
 #include <va/va_drmcommon.h>
@@ -20,11 +24,13 @@
 #include <va/va_x11.h>
 #include <algorithm>
 #include <condition_variable>
+#include <cstddef>
 #include <cstdint>
 #include <map>
 #include <memory>
 #include <mutex>
 #include <queue>
+#include <stack>
 #include <string>
 #include <thread>
 #include <utility>
@@ -32,8 +38,10 @@
 #include "audio_encoder.h"
 #include "context.h"
 #include "defs.h"
+#include "ffmpeg_raii.h"
 #include "flags.h"
 #include "mux.h"
+#include "ref_counted_frame.h"
 #include "timebase.h"
 #include "x264_encoder.h"
 
@@ -1716,10 +1724,6 @@ int QuickSyncEncoderImpl::deinit_va()
     return 0;
 }
 
-namespace {
-
-}  // namespace
-
 QuickSyncEncoderImpl::QuickSyncEncoderImpl(const std::string &filename, movit::ResourcePool *resource_pool, QSurface *surface, const string &va_display, int width, int height, AVOutputFormat *oformat, X264Encoder *x264_encoder)
 	: current_storage_frame(0), resource_pool(resource_pool), surface(surface), x264_encoder(x264_encoder), frame_width(width), frame_height(height)
 {
diff --git a/quicksync_encoder.h b/quicksync_encoder.h
index e55fd4d..c1e844b 100644
--- a/quicksync_encoder.h
+++ b/quicksync_encoder.h
@@ -27,6 +27,7 @@
 #define _H264ENCODE_H
 
 #include <epoxy/gl.h>
+#include <stdbool.h>
 #include <stdint.h>
 #include <atomic>
 #include <memory>
@@ -42,8 +43,9 @@ extern "C" {
 
 class AudioEncoder;
 class Mux;
-class QuickSyncEncoderImpl;
 class QSurface;
+class QuickSyncEncoderImpl;
+class RefCountedFrame;
 class X264Encoder;
 
 namespace movit {