mirror of https://github.com/FFmpeg/FFmpeg.git
* commit '7b9ef8d701c319c26f7d0664fe977e176764c74e': mpeg: Split error resilience bits off into a separate file Conflicts: configure libavcodec/Makefile libavcodec/mpegvideo.c Merged-by: Michael Niedermayer <michaelni@gmx.at>pull/76/merge
Michael Niedermayer
11 years ago
commit
56afbe8dbc
13 changed files with 107 additions and 55 deletions
@ -0,0 +1,60 @@ |
||||
/*
|
||||
* This file is part of FFmpeg. |
||||
* |
||||
* FFmpeg is free software; you can redistribute it and/or |
||||
* modify it under the terms of the GNU Lesser General Public |
||||
* License as published by the Free Software Foundation; either |
||||
* version 2.1 of the License, or (at your option) any later version. |
||||
* |
||||
* FFmpeg is distributed in the hope that it will be useful, |
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of |
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
||||
* Lesser General Public License for more details. |
||||
* |
||||
* You should have received a copy of the GNU Lesser General Public |
||||
* License along with FFmpeg; if not, write to the Free Software |
||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
||||
*/ |
||||
|
||||
#include "error_resilience.h" |
||||
#include "mpegvideo.h" |
||||
#include "mpeg_er.h" |
||||
|
||||
static void set_erpic(ERPicture *dst, Picture *src) |
||||
{ |
||||
int i; |
||||
|
||||
memset(dst, 0, sizeof(*dst)); |
||||
if (!src) { |
||||
dst->f = NULL; |
||||
dst->tf = NULL; |
||||
return; |
||||
} |
||||
|
||||
dst->f = src->f; |
||||
dst->tf = &src->tf; |
||||
|
||||
for (i = 0; i < 2; i++) { |
||||
dst->motion_val[i] = src->motion_val[i]; |
||||
dst->ref_index[i] = src->ref_index[i]; |
||||
} |
||||
|
||||
dst->mb_type = src->mb_type; |
||||
dst->field_picture = src->field_picture; |
||||
} |
||||
|
||||
void ff_mpeg_er_frame_start(MpegEncContext *s) |
||||
{ |
||||
ERContext *er = &s->er; |
||||
|
||||
set_erpic(&er->cur_pic, s->current_picture_ptr); |
||||
set_erpic(&er->next_pic, s->next_picture_ptr); |
||||
set_erpic(&er->last_pic, s->last_picture_ptr); |
||||
|
||||
er->pp_time = s->pp_time; |
||||
er->pb_time = s->pb_time; |
||||
er->quarter_sample = s->quarter_sample; |
||||
er->partitioned_frame = s->partitioned_frame; |
||||
|
||||
ff_er_frame_start(er); |
||||
} |
||||
@ -0,0 +1,26 @@ |
||||
/*
|
||||
* This file is part of FFmpeg. |
||||
* |
||||
* FFmpeg is free software; you can redistribute it and/or |
||||
* modify it under the terms of the GNU Lesser General Public |
||||
* License as published by the Free Software Foundation; either |
||||
* version 2.1 of the License, or (at your option) any later version. |
||||
* |
||||
* FFmpeg is distributed in the hope that it will be useful, |
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of |
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
||||
* Lesser General Public License for more details. |
||||
* |
||||
* You should have received a copy of the GNU Lesser General Public |
||||
* License along with FFmpeg; if not, write to the Free Software |
||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
||||
*/ |
||||
|
||||
#ifndef AVCODEC_MPEG_ER_H |
||||
#define AVCODEC_MPEG_ER_H |
||||
|
||||
#include "mpegvideo.h" |
||||
|
||||
void ff_mpeg_er_frame_start(MpegEncContext *s); |
||||
|
||||
#endif /* AVCODEC_MPEG_ER_H */ |
||||
Loading…
Reference in new issue