Commit b844e50a authored by John Koleszar's avatar John Koleszar Committed by Gerrit Code Review
Browse files

Merge "encode_test_driver: make ~Encoder virtual" into experimental

parents 8c70a0fc 51b7fd0d
...@@ -10,9 +10,10 @@ ...@@ -10,9 +10,10 @@
#ifndef TEST_ENCODE_TEST_DRIVER_H_ #ifndef TEST_ENCODE_TEST_DRIVER_H_
#define TEST_ENCODE_TEST_DRIVER_H_ #define TEST_ENCODE_TEST_DRIVER_H_
#include "./vpx_config.h"
#include <string> #include <string>
#include <vector> #include <vector>
#include "./vpx_config.h"
#include "third_party/googletest/src/include/gtest/gtest.h" #include "third_party/googletest/src/include/gtest/gtest.h"
#include "vpx/vpx_encoder.h" #include "vpx/vpx_encoder.h"
...@@ -46,7 +47,7 @@ enum TestMode { ...@@ -46,7 +47,7 @@ enum TestMode {
class CxDataIterator { class CxDataIterator {
public: public:
explicit CxDataIterator(vpx_codec_ctx_t *encoder) explicit CxDataIterator(vpx_codec_ctx_t *encoder)
: encoder_(encoder), iter_(NULL) {} : encoder_(encoder), iter_(NULL) {}
const vpx_codec_cx_pkt_t *Next() { const vpx_codec_cx_pkt_t *Next() {
return vpx_codec_get_cx_data(encoder_, &iter_); return vpx_codec_get_cx_data(encoder_, &iter_);
...@@ -92,7 +93,7 @@ class Encoder { ...@@ -92,7 +93,7 @@ class Encoder {
memset(&encoder_, 0, sizeof(encoder_)); memset(&encoder_, 0, sizeof(encoder_));
} }
~Encoder() { virtual ~Encoder() {
vpx_codec_destroy(&encoder_); vpx_codec_destroy(&encoder_);
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment