Kieran/ffmpeg-the-third
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

codec/packet: refactoring to allow zero-copy packet creation

Browse Source
This commit is contained in:
meh
2015-10-08 17:54:09 +02:00
parent 7e2ebcf36b
commit 306b9c6698
9 changed files with 375 additions and 295 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/codec/encoder/audio.rs
View File

@ -5,7 +5,7 @@ use libc::c_int;
use ffi::*;
use super::Encoder as Super;
use ::{Packet, Error, Dictionary, ChannelLayout, frame};
use ::{packet, Error, Dictionary, ChannelLayout, frame};
use ::util::format;
use codec::traits;
@ -120,7 +120,7 @@ impl DerefMut for Audio {
pub struct Encoder(pub Audio);
impl Encoder {
pub fn encode(&mut self, frame: &frame::Audio, out: &mut Packet) -> Result<bool, Error> {
pub fn encode<P: packet::Mut>(&mut self, frame: &frame::Audio, out: &mut P) -> Result<bool, Error> {
unsafe {
if self.format() != frame.format() {
return Err(Error::InvalidData);
@ -135,7 +135,7 @@ impl Encoder {
}
}
pub fn flush(&mut self, out: &mut Packet) -> Result<bool, Error> {
pub fn flush<P: packet::Mut>(&mut self, out: &mut P) -> Result<bool, Error> {
unsafe {
let mut got: c_int = 0;

6
src/codec/encoder/video.rs
View File

@ -6,7 +6,7 @@ use ffi::*;
use super::Encoder as Super;
use super::{MotionEstimation, Prediction, Comparison, Decision};
use ::{Packet, Error, Rational, Dictionary, frame, format};
use ::{packet, Error, Rational, Dictionary, frame, format};
use codec::traits;
pub struct Video(pub Super);
@ -368,7 +368,7 @@ pub struct Encoder(pub Video);
impl Encoder {
#[inline]
pub fn encode(&mut self, frame: &frame::Video, out: &mut Packet) -> Result<bool, Error> {
pub fn encode<P: packet::Mut>(&mut self, frame: &frame::Video, out: &mut P) -> Result<bool, Error> {
unsafe {
if self.format() != frame.format() || self.width() != frame.width() || self.height() != frame.height() {
return Err(Error::InvalidData);
@ -384,7 +384,7 @@ impl Encoder {
}
#[inline]
pub fn flush(&mut self, out: &mut Packet) -> Result<bool, Error> {
pub fn flush<P: packet::Mut>(&mut self, out: &mut P) -> Result<bool, Error> {
unsafe {
let mut got: c_int = 0;