V2.0.5

1.在录像信息文件里没有老师视频或学生视频时，把老师视频或学生视频的大小设为320x240，避免在一对多布局时出现错误

@@ -29,6 +29,8 @@ int pip_x_reduce = 3;
 int pip_y_reduce = 3;
 int pip_y_reduce = 3;
 int pip_x_border = 4;
 int pip_x_border = 4;
 
 
+#define ensure_no_zero(x, v) if(!x) x = v
+
 CAVTranscoder::CAVTranscoder(bool bOne2One, int width_teacher, int height_teacher, int width_student, int height_student, bool has_teacher, int max_audio) :
 CAVTranscoder::CAVTranscoder(bool bOne2One, int width_teacher, int height_teacher, int width_student, int height_student, bool has_teacher, int max_audio) :
 _start_time(INT64_MAX),
 _start_time(INT64_MAX),
 _all_processed(true),
 _all_processed(true),
@@ -48,6 +50,11 @@ _studentFrame(NULL),
 _pip_width(0),
 _pip_width(0),
 _pip_height(0)
 _pip_height(0)
 {
 {
+	ensure_no_zero(width_teacher, 320);
+	ensure_no_zero(height_teacher, 240);
+	ensure_no_zero(width_student, 320);
+	ensure_no_zero(height_student, 240);
+
 	_teacher_width = width_teacher;
 	_teacher_width = width_teacher;
 	_teacher_height = height_teacher;
 	_teacher_height = height_teacher;
 	_student_width = width_student;
 	_student_width = width_student;

@@ -69,3 +69,6 @@ V2.0.3
 
 
 V2.0.4
 V2.0.4
 1.支持读取编码配置文件，用于改变编码配置
 1.支持读取编码配置文件，用于改变编码配置
+
+V2.0.5
+1.在录像信息文件里没有老师视频或学生视频时，把老师视频或学生视频的大小设为320x240，避免在一对多布局时出现错误

@@ -1202,7 +1202,7 @@ int process_av_files(char * record_info, int piptype)
 int main(int argc, char * argv[])
 int main(int argc, char * argv[])
 {
 {
 	if (argc < 2) {
 	if (argc < 2) {
-		printf("   merge_pip 2.0.4\n");
+		printf("   merge_pip 2.0.5\n");
 		printf("   merge video files to one pip video according to record info file,\nusage:");
 		printf("   merge video files to one pip video according to record info file,\nusage:");
 		printf("\n   %s record_info_filename [-t {0,1,2}]  [-c codec.cfg]", argv[0]);
 		printf("\n   %s record_info_filename [-t {0,1,2}]  [-c codec.cfg]", argv[0]);
 		printf("\n\n");
 		printf("\n\n");