encode_test_driver: make ~Encoder virtual

+ some quick lint fixes

Change-Id: I95b6c32454c17d7fc717f1daa2376eb4d5418ee3
This commit is contained in:
James Zern 2013-05-03 19:08:08 -07:00
parent 6723e34224
commit 51b7fd0d77

View File

@ -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 {
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 {
memset(&encoder_, 0, sizeof(encoder_)); memset(&encoder_, 0, sizeof(encoder_));
} }
~Encoder() { virtual ~Encoder() {
vpx_codec_destroy(&encoder_); vpx_codec_destroy(&encoder_);
} }