count max audio stream should be mixed

fix bug for finished transcoding without all files transcoded

@@ -7,7 +7,8 @@ _all_processed(true),
 _one2one(true),
 _one2one(true),
 _nOutputWidth(320),
 _nOutputWidth(320),
 _cur_out_v_ts(0),
 _cur_out_v_ts(0),
-_cur_out_a_ts(0)
+_cur_out_a_ts(0),
+_max_audio(1)
 {
 {
 	if (_one2one) {
 	if (_one2one) {
 		_nOutputHeight = 480;
 		_nOutputHeight = 480;
@@ -255,11 +256,12 @@ int CAVTranscoder::open_output_file(const char *filename)
 				int16_t * psrc = (int16_t *)pFrame->extended_data[0];
 				int16_t * psrc = (int16_t *)pFrame->extended_data[0];
 				int16_t * pdst = (int16_t *)pDstFrame->extended_data[0];
 				int16_t * pdst = (int16_t *)pDstFrame->extended_data[0];
 				for (int i = 0; i < 1024; i++,pdst++,psrc++) {
 				for (int i = 0; i < 1024; i++,pdst++,psrc++) {
-					*pdst += *psrc;
+					*pdst += (*psrc/_max_audio);
 				}
 				}
 			}
 			}
 		}
 		}
 
 
+
 		pDstFrame->pts = _cur_out_a_ts;
 		pDstFrame->pts = _cur_out_a_ts;
 		pDstFrame->pkt_dts = _cur_out_a_ts;
 		pDstFrame->pkt_dts = _cur_out_a_ts;
 		pDstFrame->pkt_pts = _cur_out_a_ts;
 		pDstFrame->pkt_pts = _cur_out_a_ts;
@@ -268,7 +270,6 @@ int CAVTranscoder::open_output_file(const char *filename)
 
 
 		int got_frame = 0;
 		int got_frame = 0;
 		encode_write_frame(pDstFrame, 1, &got_frame);
 		encode_write_frame(pDstFrame, 1, &got_frame);
-//		av_frame_free(&pDstFrame);
 
 
 		return 0;
 		return 0;
 	}
 	}
@@ -399,6 +400,7 @@ int CAVTranscoder::encode_write_frame(AVFrame *filt_frame, unsigned int stream_i
 	av_init_packet(&enc_pkt);
 	av_init_packet(&enc_pkt);
 	ret = enc_func(_ofmt_ctx->streams[stream_index]->codec, &enc_pkt,
 	ret = enc_func(_ofmt_ctx->streams[stream_index]->codec, &enc_pkt,
 		filt_frame, got_frame);
 		filt_frame, got_frame);
+	av_frame_unref(filt_frame);
 	av_frame_free(&filt_frame);
 	av_frame_free(&filt_frame);
 	if (ret < 0)
 	if (ret < 0)
 		return ret;
 		return ret;
@@ -438,3 +440,8 @@ int CAVTranscoder::flush_encoder(unsigned int stream_index)
 	}
 	}
 	return ret;
 	return ret;
 }
 }
+
+void CAVTranscoder::set_max_audio(int max_audio)
+{
+	_max_audio = max_audio;
+}

@@ -39,5 +39,8 @@ private:
 	int flush_encoder(unsigned int stream_index);
 	int flush_encoder(unsigned int stream_index);
 
 
 	void * _a_frame_pool;
 	void * _a_frame_pool;
+	int _max_audio;
+public:
+	void set_max_audio(int max_audio);
 };
 };
 
 

@@ -577,6 +577,28 @@ void add_media_info(media_info m)
 	sorted_media.insert(it, m);
 	sorted_media.insert(it, m);
 }
 }
 
 
+
+list<media_info> audio_files;
+
+int count_audio_files(float mid)
+{
+	int files = 0;
+	list<media_info>::iterator it = audio_files.begin();
+	for (; it != audio_files.end(); it++){
+		if (it->start_time < mid){
+			if (it->end_time > mid) {
+				files++;
+			}
+		}
+		else {
+			break;
+		}
+	}
+	return files;
+}
+
+int max_audio = 1;
+
 void add_media_infos()
 void add_media_infos()
 {
 {
 	sorted_media.clear();
 	sorted_media.clear();
@@ -597,15 +619,51 @@ void add_media_infos()
 		m.start_time_ms = f.start_time * 1000;
 		m.start_time_ms = f.start_time * 1000;
 		m.end_time_ms = f.end_time * 1000;
 		m.end_time_ms = f.end_time * 1000;
 		add_media_info(m);
 		add_media_info(m);
-		/*
+
 		m.t_type = tt_end;
 		m.t_type = tt_end;
 		m.type_time = m.end_time;
 		m.type_time = m.end_time;
-		add_media_info(m);*/
+		add_media_info(m);
 	}
 	}
 
 
+	list<media_info> audio_type_files;
+
 	list<media_info>::iterator it = sorted_media.begin();
 	list<media_info>::iterator it = sorted_media.begin();
 	for (; it != sorted_media.end(); it++){
 	for (; it != sorted_media.end(); it++){
-		sorted_infos.push_back(*it);
+		if (it->m_type == mt_audio) {
+			if (it->t_type == tt_start) {
+				audio_files.push_back(*it);
+			}
+			audio_type_files.push_back(*it);
+		}
+	}
+
+	it = sorted_media.begin();
+	for (; it != sorted_media.end();){
+		if (it->t_type == tt_end) {
+			it = sorted_media.erase(it);
+		}
+		else
+		{
+			it++;
+		}
+	}
+
+	it = audio_type_files.begin();
+	media_info last = *it;
+
+	for (it++; it != audio_type_files.end(); it++) {
+		if (it->t_type == tt_end) {
+			if (last.t_type == tt_start) {
+				float mid = (it->type_time + last.type_time) / 2;
+				int files_with_mid = count_audio_files(mid);
+				if (files_with_mid > max_audio) {
+					max_audio = files_with_mid;
+				}
+			}
+		}
+		else {
+			last = *it;
+		}
 	}
 	}
 }
 }
 
 
@@ -894,6 +952,7 @@ int process_av_files()
 	avfilter_register_all();
 	avfilter_register_all();
 
 
 	CAVTranscoder videoTranscoder;
 	CAVTranscoder videoTranscoder;
+	videoTranscoder.set_max_audio(max_audio);
 
 
 	int64_t cur_time = 0;
 	int64_t cur_time = 0;
 	bool has_file = sorted_media.size();
 	bool has_file = sorted_media.size();
@@ -924,7 +983,7 @@ int process_av_files()
 		cur_time = videoTranscoder.transcode();
 		cur_time = videoTranscoder.transcode();
 	}
 	}
 
 
-	while (videoTranscoder.all_processed()){
+	while (!videoTranscoder.all_processed()){
 			cur_time = videoTranscoder.transcode();
 			cur_time = videoTranscoder.transcode();
 	}
 	}