Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(31)

Unified Diff: webrtc/modules/video_coding/main/interface/video_coding_defines.h

Issue 1467173003: Remove duplicated headers after updating downstream code. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: webrtc/modules/video_coding/main/interface/video_coding_defines.h
diff --git a/webrtc/modules/video_coding/main/interface/video_coding_defines.h b/webrtc/modules/video_coding/main/interface/video_coding_defines.h
deleted file mode 100644
index 833a355fc2ff1695e99b83e9746f917decb13e77..0000000000000000000000000000000000000000
--- a/webrtc/modules/video_coding/main/interface/video_coding_defines.h
+++ /dev/null
@@ -1,203 +0,0 @@
-/*
- * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
- *
- * Use of this source code is governed by a BSD-style license
- * that can be found in the LICENSE file in the root of the source
- * tree. An additional intellectual property rights grant can be found
- * in the file PATENTS. All contributing project authors may
- * be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef WEBRTC_MODULES_VIDEO_CODING_INCLUDE_VIDEO_CODING_DEFINES_H_
-#define WEBRTC_MODULES_VIDEO_CODING_INCLUDE_VIDEO_CODING_DEFINES_H_
-
-#pragma message("WARNING: video_coding/main/interface is DEPRECATED; use video_coding/include")
-
-#include "webrtc/modules/include/module_common_types.h"
-#include "webrtc/typedefs.h"
-#include "webrtc/video_frame.h"
-
-namespace webrtc {
-
-// Error codes
-#define VCM_FRAME_NOT_READY 3
-#define VCM_REQUEST_SLI 2
-#define VCM_MISSING_CALLBACK 1
-#define VCM_OK 0
-#define VCM_GENERAL_ERROR -1
-#define VCM_LEVEL_EXCEEDED -2
-#define VCM_MEMORY -3
-#define VCM_PARAMETER_ERROR -4
-#define VCM_UNKNOWN_PAYLOAD -5
-#define VCM_CODEC_ERROR -6
-#define VCM_UNINITIALIZED -7
-#define VCM_NO_CODEC_REGISTERED -8
-#define VCM_JITTER_BUFFER_ERROR -9
-#define VCM_OLD_PACKET_ERROR -10
-#define VCM_NO_FRAME_DECODED -11
-#define VCM_ERROR_REQUEST_SLI -12
-#define VCM_NOT_IMPLEMENTED -20
-
-enum { kDefaultStartBitrateKbps = 300 };
-
-enum VCMVideoProtection {
- kProtectionNone,
- kProtectionNack,
- kProtectionFEC,
- kProtectionNackFEC,
-};
-
-enum VCMTemporalDecimation {
- kBitrateOverUseDecimation,
-};
-
-struct VCMFrameCount {
- uint32_t numKeyFrames;
- uint32_t numDeltaFrames;
-};
-
-// Callback class used for sending data ready to be packetized
-class VCMPacketizationCallback {
- public:
- virtual int32_t SendData(uint8_t payloadType,
- const EncodedImage& encoded_image,
- const RTPFragmentationHeader& fragmentationHeader,
- const RTPVideoHeader* rtpVideoHdr) = 0;
-
- protected:
- virtual ~VCMPacketizationCallback() {
- }
-};
-
-// Callback class used for passing decoded frames which are ready to be rendered.
-class VCMReceiveCallback {
- public:
- virtual int32_t FrameToRender(VideoFrame& videoFrame) = 0;
- virtual int32_t ReceivedDecodedReferenceFrame(
- const uint64_t pictureId) {
- return -1;
- }
- // Called when the current receive codec changes.
- virtual void OnIncomingPayloadType(int payload_type) {}
-
- protected:
- virtual ~VCMReceiveCallback() {
- }
-};
-
-// Callback class used for informing the user of the bit rate and frame rate produced by the
-// encoder.
-class VCMSendStatisticsCallback {
- public:
- virtual int32_t SendStatistics(const uint32_t bitRate,
- const uint32_t frameRate) = 0;
-
- protected:
- virtual ~VCMSendStatisticsCallback() {
- }
-};
-
-// Callback class used for informing the user of the incoming bit rate and frame rate.
-class VCMReceiveStatisticsCallback {
- public:
- virtual void OnReceiveRatesUpdated(uint32_t bitRate, uint32_t frameRate) = 0;
- virtual void OnDiscardedPacketsUpdated(int discarded_packets) = 0;
- virtual void OnFrameCountsUpdated(const FrameCounts& frame_counts) = 0;
-
- protected:
- virtual ~VCMReceiveStatisticsCallback() {
- }
-};
-
-// Callback class used for informing the user of decode timing info.
-class VCMDecoderTimingCallback {
- public:
- virtual void OnDecoderTiming(int decode_ms,
- int max_decode_ms,
- int current_delay_ms,
- int target_delay_ms,
- int jitter_buffer_ms,
- int min_playout_delay_ms,
- int render_delay_ms) = 0;
-
- protected:
- virtual ~VCMDecoderTimingCallback() {}
-};
-
-// Callback class used for telling the user about how to configure the FEC,
-// and the rates sent the last second is returned to the VCM.
-class VCMProtectionCallback {
- public:
- virtual int ProtectionRequest(const FecProtectionParams* delta_params,
- const FecProtectionParams* key_params,
- uint32_t* sent_video_rate_bps,
- uint32_t* sent_nack_rate_bps,
- uint32_t* sent_fec_rate_bps) = 0;
-
- protected:
- virtual ~VCMProtectionCallback() {
- }
-};
-
-class VideoEncoderRateObserver {
- public:
- virtual ~VideoEncoderRateObserver() {}
- virtual void OnSetRates(uint32_t bitrate_bps, int framerate) = 0;
-};
-
-// Callback class used for telling the user about what frame type needed to continue decoding.
-// Typically a key frame when the stream has been corrupted in some way.
-class VCMFrameTypeCallback {
- public:
- virtual int32_t RequestKeyFrame() = 0;
- virtual int32_t SliceLossIndicationRequest(
- const uint64_t pictureId) {
- return -1;
- }
-
- protected:
- virtual ~VCMFrameTypeCallback() {
- }
-};
-
-// Callback class used for telling the user about which packet sequence numbers are currently
-// missing and need to be resent.
-class VCMPacketRequestCallback {
- public:
- virtual int32_t ResendPackets(const uint16_t* sequenceNumbers,
- uint16_t length) = 0;
-
- protected:
- virtual ~VCMPacketRequestCallback() {
- }
-};
-
-// Callback used to inform the user of the the desired resolution
-// as subscribed by Media Optimization (Quality Modes)
-class VCMQMSettingsCallback {
- public:
- virtual int32_t SetVideoQMSettings(const uint32_t frameRate,
- const uint32_t width,
- const uint32_t height) = 0;
-
- virtual void SetTargetFramerate(int frame_rate) = 0;
-
- protected:
- virtual ~VCMQMSettingsCallback() {
- }
-};
-
-// Callback class used for telling the user about the size (in time) of the
-// render buffer, that is the size in time of the complete continuous frames.
-class VCMRenderBufferSizeCallback {
- public:
- virtual void RenderBufferSizeMs(int buffer_size_ms) = 0;
-
- protected:
- virtual ~VCMRenderBufferSizeCallback() {
- }
-};
-
-} // namespace webrtc
-
-#endif // WEBRTC_MODULES_VIDEO_CODING_INCLUDE_VIDEO_CODING_DEFINES_H_
« no previous file with comments | « webrtc/modules/video_coding/main/interface/video_coding.h ('k') | webrtc/modules/video_coding/main/source/encoded_frame.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698